diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-29 13:59:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-29 13:59:05 +0100 |
| commit | b5f9a9d5113efe11a3b9dad600a6f833274da595 (patch) | |
| tree | 6db5fb34a2d590086e25f7f682fecb5f43e6b283 /arch/powerpc/include/asm/pci-bridge.h | |
| parent | a1216394e620d0dfbb03c712ae3210e7b77c9e11 (diff) | |
| parent | 8d4d08ce8319ae26227c4dd558405963c14c2037 (diff) | |
Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata
Conflicts:
drivers/spi/spi-rspi.c
Diffstat (limited to 'arch/powerpc/include/asm/pci-bridge.h')
| -rw-r--r-- | arch/powerpc/include/asm/pci-bridge.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h index 2c1d8cb9b26..32d0d2018fa 100644 --- a/arch/powerpc/include/asm/pci-bridge.h +++ b/arch/powerpc/include/asm/pci-bridge.h @@ -209,7 +209,6 @@ static inline struct eeh_dev *of_node_to_eeh_dev(struct device_node *dn) extern struct pci_bus *pcibios_find_pci_bus(struct device_node *dn); /** Remove all of the PCI devices under this bus */ -extern void __pcibios_remove_pci_devices(struct pci_bus *bus, int purge_pe); extern void pcibios_remove_pci_devices(struct pci_bus *bus); /** Discover new pci devices under this bus, and add them */ |