diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
commit | 6b995751c2e851d2bc9c277b5884d0adb519e31d (patch) | |
tree | 7a15b41b5d8ce612915584a0773c670d5c0ab5b8 /arch/ppc/kernel/Makefile | |
parent | 6c2f4267833f453156f8f439cc32eb4c92f357b4 (diff) | |
parent | d27ba47e7e8c466c18983a1779d611f82d6a354f (diff) |
Merge branch 'master'
Diffstat (limited to 'arch/ppc/kernel/Makefile')
-rw-r--r-- | arch/ppc/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile index c610ca933a25..76a55a438f23 100644 --- a/arch/ppc/kernel/Makefile +++ b/arch/ppc/kernel/Makefile | |||
@@ -22,6 +22,7 @@ obj-$(CONFIG_POWER4) += cpu_setup_power4.o | |||
22 | obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o | 22 | obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o |
23 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o | 23 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o |
24 | obj-$(CONFIG_PCI) += pci.o | 24 | obj-$(CONFIG_PCI) += pci.o |
25 | obj-$(CONFIG_RAPIDIO) += rio.o | ||
25 | obj-$(CONFIG_KGDB) += ppc-stub.o | 26 | obj-$(CONFIG_KGDB) += ppc-stub.o |
26 | obj-$(CONFIG_SMP) += smp.o smp-tbsync.o | 27 | obj-$(CONFIG_SMP) += smp.o smp-tbsync.o |
27 | obj-$(CONFIG_TAU) += temp.o | 28 | obj-$(CONFIG_TAU) += temp.o |