diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 14:50:17 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 14:50:17 -0400 |
| commit | 9c5891bd4342349a200676d33f742dd1b864822c (patch) | |
| tree | b14c1698f2d8ce5276e1befd562f6398a46b48b9 /arch/powerpc/include/asm/pci-bridge.h | |
| parent | ecda040ff3724f021a96491ecee88d48e968c153 (diff) | |
| parent | 5ae90d8e467e625e447000cb4335c4db973b1095 (diff) | |
Merge 3.11-rc3 into char-misc-next.
This resolves a merge issue with:
drivers/misc/mei/init.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 2c1d8cb9b265..32d0d2018faf 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) | |||
| 209 | extern struct pci_bus *pcibios_find_pci_bus(struct device_node *dn); | 209 | extern struct pci_bus *pcibios_find_pci_bus(struct device_node *dn); |
| 210 | 210 | ||
| 211 | /** Remove all of the PCI devices under this bus */ | 211 | /** Remove all of the PCI devices under this bus */ |
| 212 | extern void __pcibios_remove_pci_devices(struct pci_bus *bus, int purge_pe); | ||
| 213 | extern void pcibios_remove_pci_devices(struct pci_bus *bus); | 212 | extern void pcibios_remove_pci_devices(struct pci_bus *bus); |
| 214 | 213 | ||
| 215 | /** Discover new pci devices under this bus, and add them */ | 214 | /** Discover new pci devices under this bus, and add them */ |