diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-04-04 09:51:08 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-04-04 09:51:08 (GMT) |
| commit | a99e31512aa435e8391ba5f5e64abeac9c5f2f32 (patch) | |
| tree | 56bb9d9ccfe76520b672249757e25f686275b204 /tools/perf/arch/powerpc/util/header.c | |
| parent | 86c8dd7f4da3fb3f92fc5ab5144c971639d39745 (diff) | |
| parent | f03b24a851d32ca85dacab01785b24a7ee717d37 (diff) | |
| download | linux-a99e31512aa435e8391ba5f5e64abeac9c5f2f32.tar.xz | |
Merge branch 'for-linus' into for-next
Conflicts:
sound/hda/hdac_i915.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'tools/perf/arch/powerpc/util/header.c')
| -rw-r--r-- | tools/perf/arch/powerpc/util/header.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/arch/powerpc/util/header.c b/tools/perf/arch/powerpc/util/header.c index 6138bde..f8ccee1 100644 --- a/tools/perf/arch/powerpc/util/header.c +++ b/tools/perf/arch/powerpc/util/header.c @@ -4,6 +4,8 @@ #include <stdlib.h> #include <string.h> #include <linux/stringify.h> +#include "header.h" +#include "util.h" #define mfspr(rn) ({unsigned long rval; \ asm volatile("mfspr %0," __stringify(rn) \ |