diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-25 14:51:50 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 14:51:50 +0200 |
| commit | e5baa396af7560382d2cf3f0871d616b61fc284c (patch) | |
| tree | 6afc166894b8c8b3b2cf6add72a726be14ae2443 /arch/ppc/kernel/Makefile | |
| parent | [PATCH] powerpc: merge semaphore.h (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-ucb (diff) | |
| download | linux-e5baa396af7560382d2cf3f0871d616b61fc284c.tar.xz linux-e5baa396af7560382d2cf3f0871d616b61fc284c.zip | |
Merge from Linus' tree.
Diffstat (limited to 'arch/ppc/kernel/Makefile')
| -rw-r--r-- | arch/ppc/kernel/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile index abf10dcb787b..ce166e3de53b 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 |