summaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel/Makefile
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-09-23 06:43:55 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-23 07:17:34 +0200
commit244bc050d5c9431682b7d834aff92e663fe88bb2 (patch)
treede338fb876f51ba3d4a476b1b69694b3f7b36e5a /arch/ppc/kernel/Makefile
parent[PATCH] DEBUG redefined in drivers/mtd/devices/docecc.c (diff)
downloadlinux-244bc050d5c9431682b7d834aff92e663fe88bb2.tar.xz
linux-244bc050d5c9431682b7d834aff92e663fe88bb2.zip
[PATCH] ppc32: fix build with oprofile
Current -git tree doesn't build when enabling oprofile on a non-bookE CPU (like on a PowerMac for example). While there is no performance counter support for these CPUs implemented yet, it's still nice to be able to use the timer based sampling, and that got broken. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/kernel/Makefile')
-rw-r--r--arch/ppc/kernel/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index 1fb92f16acd6..b1457a8a9c0f 100644
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -15,9 +15,8 @@ extra-y += vmlinux.lds
obj-y := entry.o traps.o irq.o idle.o time.o misc.o \
process.o signal.o ptrace.o align.o \
semaphore.o syscalls.o setup.o \
- cputable.o ppc_htab.o
+ cputable.o ppc_htab.o perfmon.o
obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o
-obj-$(CONFIG_E500) += perfmon.o
obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
obj-$(CONFIG_POWER4) += cpu_setup_power4.o
obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o