Commit:     ce5ccdef1090367f3024b4d5e7908bf6bd2929ae
Parent:     74e8f346d59074147c564d9c1ffd6caf18286516
Author:     Kumar Gala <[EMAIL PROTECTED]>
AuthorDate: Mon Jul 16 23:27:10 2007 -0500
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Aug 22 14:48:40 2007 -0700

    PCI: Move prototypes for pci_bus_find_capability to include/linux/pci.h
    We need pci_bus_find_capability() in some arch/powerpc code so move
    the prototype into a header accessible to it.
    Also kill the duplicate prototype for pci_bus_alloc_resource().
    Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
 drivers/pci/pci.h   |    8 +-------
 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 c6e132d..4c36e80 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 
 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 
@@ -35,7 +30,6 @@ static inline int pci_proc_detach_bus(struct pci_bus *bus) { 
return 0; }
 /* 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 --git a/include/linux/pci.h b/include/linux/pci.h
index e7d8d4e..325225c 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 
 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);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to