diff options
| -rw-r--r-- | drivers/pci/pci.h | 8 | ||||
| -rw-r--r-- | include/linux/pci.h | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index c6e132d7c0f7..4c36e80f6d26 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
| @@ -5,12 +5,7 @@ extern int pci_uevent(struct device *dev, char **envp, int num_envp, | |||
| 5 | extern int pci_create_sysfs_dev_files(struct pci_dev *pdev); | 5 | extern int pci_create_sysfs_dev_files(struct pci_dev *pdev); |
| 6 | extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev); | 6 | extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev); |
| 7 | extern void pci_cleanup_rom(struct pci_dev *dev); | 7 | extern void pci_cleanup_rom(struct pci_dev *dev); |
| 8 | extern int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, | 8 | |
| 9 | resource_size_t size, resource_size_t align, | ||
| 10 | resource_size_t min, unsigned int type_mask, | ||
| 11 | void (*alignf)(void *, struct resource *, | ||
| 12 | resource_size_t, resource_size_t), | ||
| 13 | void *alignf_data); | ||
| 14 | /* Firmware callbacks */ | 9 | /* Firmware callbacks */ |
| 15 | extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state); | 10 | extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state); |
| 16 | extern int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t state); | 11 | 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(struct pci_bus *bus) { return 0; } | |||
| 35 | 30 | ||
| 36 | /* Functions for PCI Hotplug drivers to use */ | 31 | /* Functions for PCI Hotplug drivers to use */ |
| 37 | extern unsigned int pci_do_scan_bus(struct pci_bus *bus); | 32 | extern unsigned int pci_do_scan_bus(struct pci_bus *bus); |
| 38 | extern int pci_bus_find_capability (struct pci_bus *bus, unsigned int devfn, int cap); | ||
| 39 | 33 | ||
| 40 | extern void pci_remove_legacy_files(struct pci_bus *bus); | 34 | extern void pci_remove_legacy_files(struct pci_bus *bus); |
| 41 | 35 | ||
diff --git a/include/linux/pci.h b/include/linux/pci.h index e7d8d4e19a53..325225c48458 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -578,6 +578,9 @@ int pci_set_power_state(struct pci_dev *dev, pci_power_t state); | |||
| 578 | pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state); | 578 | pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state); |
| 579 | int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable); | 579 | int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable); |
| 580 | 580 | ||
| 581 | /* Functions for PCI Hotplug drivers to use */ | ||
| 582 | int pci_bus_find_capability (struct pci_bus *bus, unsigned int devfn, int cap); | ||
| 583 | |||
| 581 | /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */ | 584 | /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */ |
| 582 | void pci_bus_assign_resources(struct pci_bus *bus); | 585 | void pci_bus_assign_resources(struct pci_bus *bus); |
| 583 | void pci_bus_size_bridges(struct pci_bus *bus); | 586 | void pci_bus_size_bridges(struct pci_bus *bus); |
