powerpc: Merge pci.h
commitf8ef2705969e0409efedeb889445da67806ba9ea
authorPaul Mackerras <paulus@samba.org>
Sat, 19 Nov 2005 09:46:04 +0000 (19 20:46 +1100)
committerPaul Mackerras <paulus@samba.org>
Sat, 19 Nov 2005 09:46:04 +0000 (19 20:46 +1100)
tree661acd5711b2bb662c659bb62adea116ce6d45f0
parent047ea7846565917c4a666635fa1fa4b5c587cd55
powerpc: Merge pci.h

This involves some minor changes: a few unused functions that the
ppc32 pci.c provides are no longer declared here or exported;
pcibios_assign_all_busses now just refers to the pci_assign_all_buses
variable on both 32-bit and 64-bit; pcibios_scan_all_fns is now
just 0 instead of a function that always returns 0 on 64-bit.

Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/pci_64.c
arch/powerpc/kernel/ppc_ksyms.c
include/asm-powerpc/pci.h [moved from include/asm-ppc64/pci.h with 63% similarity]
include/asm-powerpc/ppc-pci.h