[POWERPC] Merge 32 and 64 bits pcibios_enable_device

This merge the two implementations, based on the previously
fixed up 32 bits one.  The pcibios_enable_device_hook in ppc_md
is now available for ppc64 use.  Also remove the new unused
"initial" parameter from it and fixup users.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --cc arch/powerpc/kernel/pci-common.c
Simple merge

diff --cc arch/powerpc/kernel/pci_32.c
Simple merge

diff --cc arch/powerpc/kernel/pci_64.c
Simple merge

diff --cc arch/powerpc/platforms/powermac/pci.c
Simple merge

diff --cc arch/powerpc/platforms/powermac/pmac.h
Simple merge

diff --cc include/asm-powerpc/machdep.h
Simple merge