diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-01 11:11:07 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-01 11:11:07 +0100 |
| commit | e87a3dd33eab30b4db539500064a9584867e4f2c (patch) | |
| tree | 2f7ad16e46ae30518ff63bb5391b63f7f7cc74dd /arch/powerpc/kernel/perf_callchain.c | |
| parent | ALSA: es18xx: remove snd_audiodrive structure (diff) | |
| parent | sound: via82xx: deactivate DXS controls of inactive streams (diff) | |
| download | linux-e87a3dd33eab30b4db539500064a9584867e4f2c.tar.xz linux-e87a3dd33eab30b4db539500064a9584867e4f2c.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/powerpc/kernel/perf_callchain.c')
| -rw-r--r-- | arch/powerpc/kernel/perf_callchain.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/perf_callchain.c b/arch/powerpc/kernel/perf_callchain.c index f74b62c67511..0a03cf70d247 100644 --- a/arch/powerpc/kernel/perf_callchain.c +++ b/arch/powerpc/kernel/perf_callchain.c @@ -10,7 +10,7 @@ */ #include <linux/kernel.h> #include <linux/sched.h> -#include <linux/perf_counter.h> +#include <linux/perf_event.h> #include <linux/percpu.h> #include <linux/uaccess.h> #include <linux/mm.h> |