diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /arch/ppc/kernel/Makefile | |
parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) |
Merge ../linux-2.6
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 |