diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 02:44:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 02:44:08 +0100 |
| commit | c0d362a832ee70435fc4555a64f820893b1da0bd (patch) | |
| tree | 162497df64451936dfdb70f972dd7849d3e3e520 /arch/powerpc/kernel/Makefile | |
| parent | Merge commit 'v2.6.29-rc1' into perfcounters/core (diff) | |
| parent | powerpc/perf_counter: Add support for POWER6 (diff) | |
| download | linux-c0d362a832ee70435fc4555a64f820893b1da0bd.tar.xz linux-c0d362a832ee70435fc4555a64f820893b1da0bd.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perfcounters into perfcounters/core
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
| -rw-r--r-- | arch/powerpc/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 8d1a419df35d..7c941ec3b23e 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -94,6 +94,7 @@ obj-$(CONFIG_AUDIT) += audit.o obj64-$(CONFIG_AUDIT) += compat_audit.o obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o +obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o ppc970-pmu.o power6-pmu.o obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o |