Commit e05b3b4a authored by Paul Mackerras's avatar Paul Mackerras
Browse files

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: default avatarPaul Mackerras <paulus@samba.org>
parent 820a8ce7

arch/powerpc/kernel/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -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)

arch/powerpc/kernel/pci_32.c

0 → 100644
+1897 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/ppc/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE