diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:44:08 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:44:08 -0500 |
| commit | c0d362a832ee70435fc4555a64f820893b1da0bd (patch) | |
| tree | 162497df64451936dfdb70f972dd7849d3e3e520 /arch/powerpc/kernel/Makefile | |
| parent | 506c10f26c481b7f8ef27c1c79290f68989b2e9e (diff) | |
| parent | f78628374a13bc150db77c6e02d4f2c0a7f932ef (diff) | |
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 | |||
| 94 | obj64-$(CONFIG_AUDIT) += compat_audit.o | 94 | obj64-$(CONFIG_AUDIT) += compat_audit.o |
| 95 | 95 | ||
| 96 | obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o | 96 | obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o |
| 97 | obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o ppc970-pmu.o power6-pmu.o | ||
| 97 | 98 | ||
| 98 | obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o | 99 | obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o |
| 99 | 100 | ||