diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-01-15 12:05:47 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-15 12:05:47 +0100 |
| commit | e05b3b4adbaeea508bd1c195f1f2e22c8251176b (patch) | |
| tree | 61b88c6524b199c6051b46d040b0c379109d40ce /arch/powerpc/kernel/Makefile | |
| parent | powerpc: Make ARCH=powerpc the default for 32-bit ppc (diff) | |
| download | linux-e05b3b4adbaeea508bd1c195f1f2e22c8251176b.tar.xz linux-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/powerpc/kernel/Makefile')
| -rw-r--r-- | arch/powerpc/kernel/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index a94699d8dc52..c287980b7e65 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -60,7 +60,8 @@ obj-$(CONFIG_MODULES) += $(module-y) pci64-$(CONFIG_PPC64) += pci_64.o pci_dn.o pci_iommu.o \ pci_direct_iommu.o iomap.o -obj-$(CONFIG_PCI) += $(pci64-y) +pci32-$(CONFIG_PPC32) := pci_32.o +obj-$(CONFIG_PCI) += $(pci64-y) $(pci32-y) kexec-$(CONFIG_PPC64) := machine_kexec_64.o crash.o kexec-$(CONFIG_PPC32) := machine_kexec_32.o obj-$(CONFIG_KEXEC) += machine_kexec.o $(kexec-y) |