aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-01-15 22:05:47 +1100
committerPaul Mackerras <paulus@samba.org>2006-01-15 22:05:47 +1100
commite05b3b4adbaeea508bd1c195f1f2e22c8251176b (patch)
tree61b88c6524b199c6051b46d040b0c379109d40ce /arch/ppc
parentpowerpc: Make ARCH=powerpc the default for 32-bit ppc (diff)
downloadlinux-dev-e05b3b4adbaeea508bd1c195f1f2e22c8251176b.tar.xz
linux-dev-e05b3b4adbaeea508bd1c195f1f2e22c8251176b.zip
powerpc/32: Restore previous version of 32-bit PCI code
When I removed the powermac support from arch/ppc/kernel/pci.c, I overlooked the fact that that file is used in 32-bit ARCH=powerpc builds. To prevent problems in future, restore the original version of that file as arch/powerpc/kernel/pci_32.c, and use that. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/kernel/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index 647da4c1d219..e399bbb969a4 100644
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -40,7 +40,6 @@ obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o
obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
obj-$(CONFIG_MODULES) += module.o
obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o
-obj-$(CONFIG_PCI) += pci.o
obj-$(CONFIG_KGDB) += ppc-stub.o
obj-$(CONFIG_TAU) += temp.o
ifndef CONFIG_E200