diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 14:58:01 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 14:58:04 +1100 |
| commit | 7f1546329db7b573f3a640d75cc1af40dc5ee9ed (patch) | |
| tree | 2fe1446a800cfd5a5f52b3bdc16f9dd43968eb57 /tools/perf/util/perf_regs.h | |
| parent | ddb758d5bb04265c29afbec3496f4b2f2fc2aa09 (diff) | |
| parent | f497c33a948932e2a11b71d1ea07b2eedbc2f0d7 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/h8300/include/asm/Kbuild
include/linux/acpi.h
include/linux/wait.h
tools/perf/config/Makefile
tools/perf/config/feature-tests.mak
Diffstat (limited to 'tools/perf/util/perf_regs.h')
| -rw-r--r-- | tools/perf/util/perf_regs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/perf_regs.h b/tools/perf/util/perf_regs.h index 5a4f2b6f3738..a3d42cd74919 100644 --- a/tools/perf/util/perf_regs.h +++ b/tools/perf/util/perf_regs.h @@ -1,7 +1,7 @@ #ifndef __PERF_REGS_H #define __PERF_REGS_H -#ifdef HAVE_PERF_REGS +#ifdef HAVE_PERF_REGS_SUPPORT #include <perf_regs.h> #else #define PERF_REGS_MASK 0 @@ -10,5 +10,5 @@ static inline const char *perf_reg_name(int id __maybe_unused) { return NULL; } -#endif /* HAVE_PERF_REGS */ +#endif /* HAVE_PERF_REGS_SUPPORT */ #endif /* __PERF_REGS_H */ |