Signed-off-by: Andrew Morton --- drivers/pci/pci.h | 8 +------- include/linux/pci.h | 3 +++ 2 files changed, 4 insertions(+), 7 deletions(-) diff -puN drivers/pci/pci.h~gregkh-pci-pci-move-prototypes-for-pci_bus_find_capability-to-include-linux-pcih drivers/pci/pci.h --- a/drivers/pci/pci.h~gregkh-pci-pci-move-prototypes-for-pci_bus_find_capability-to-include-linux-pcih +++ a/drivers/pci/pci.h @@ -5,12 +5,7 @@ extern int pci_uevent(struct device *dev extern int pci_create_sysfs_dev_files(struct pci_dev *pdev); extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev); extern void pci_cleanup_rom(struct pci_dev *dev); -extern int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, - resource_size_t size, resource_size_t align, - resource_size_t min, unsigned int type_mask, - void (*alignf)(void *, struct resource *, - resource_size_t, resource_size_t), - void *alignf_data); + /* Firmware callbacks */ extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state); extern int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t state); @@ -35,7 +30,6 @@ static inline int pci_proc_detach_bus(st /* Functions for PCI Hotplug drivers to use */ extern unsigned int pci_do_scan_bus(struct pci_bus *bus); -extern int pci_bus_find_capability (struct pci_bus *bus, unsigned int devfn, int cap); extern void pci_remove_legacy_files(struct pci_bus *bus); diff -puN include/linux/pci.h~gregkh-pci-pci-move-prototypes-for-pci_bus_find_capability-to-include-linux-pcih include/linux/pci.h --- a/include/linux/pci.h~gregkh-pci-pci-move-prototypes-for-pci_bus_find_capability-to-include-linux-pcih +++ a/include/linux/pci.h @@ -578,6 +578,9 @@ int pci_set_power_state(struct pci_dev * pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state); int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable); +/* Functions for PCI Hotplug drivers to use */ +int pci_bus_find_capability (struct pci_bus *bus, unsigned int devfn, int cap); + /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */ void pci_bus_assign_resources(struct pci_bus *bus); void pci_bus_size_bridges(struct pci_bus *bus); _