diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /arch/powerpc/kernel/Makefile | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
| -rw-r--r-- | arch/powerpc/kernel/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 82c223852e..d8240ce221 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
| @@ -37,7 +37,6 @@ obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o | |||
| 37 | obj-$(CONFIG_TAU) += tau_6xx.o | 37 | obj-$(CONFIG_TAU) += tau_6xx.o |
| 38 | obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o | 38 | obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o |
| 39 | obj32-$(CONFIG_MODULES) += module_32.o | 39 | obj32-$(CONFIG_MODULES) += module_32.o |
| 40 | obj-$(CONFIG_E500) += perfmon_fsl_booke.o | ||
| 41 | 40 | ||
| 42 | ifeq ($(CONFIG_PPC_MERGE),y) | 41 | ifeq ($(CONFIG_PPC_MERGE),y) |
| 43 | 42 | ||