[PATCH] More PCI fixes for 2.6.7

From: Greg KH
Date: Fri Jul 02 2004 - 16:42:29 EST


ChangeSet 1.1785, 2004/07/02 13:26:39-07:00, lxiep@xxxxxxxxxx

[PATCH] PCI: export pci_scan_child_bus for the pci hotplug drivers to use

Signed-off-by: Linda Xie lxie@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <greg@xxxxxxxxx>


drivers/pci/probe.c | 5 +++--
include/linux/pci.h | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)


diff -Nru a/drivers/pci/probe.c b/drivers/pci/probe.c
--- a/drivers/pci/probe.c 2004-07-02 14:25:00 -07:00
+++ b/drivers/pci/probe.c 2004-07-02 14:25:01 -07:00
@@ -326,7 +326,7 @@
return child;
}

-static unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus);
+unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus);

/*
* If it's a bridge, configure it and scan the bus behind it.
@@ -694,7 +694,7 @@
return nr;
}

-static unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)
+unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)
{
unsigned int devfn, pass, max = bus->secondary;
struct pci_dev *dev;
@@ -801,4 +801,5 @@
EXPORT_SYMBOL(pci_scan_slot);
EXPORT_SYMBOL(pci_scan_bridge);
EXPORT_SYMBOL(pci_scan_single_device);
+EXPORT_SYMBOL_GPL(pci_scan_child_bus);
#endif
diff -Nru a/include/linux/pci.h b/include/linux/pci.h
--- a/include/linux/pci.h 2004-07-02 14:25:00 -07:00
+++ b/include/linux/pci.h 2004-07-02 14:25:00 -07:00
@@ -659,6 +659,7 @@
}
int pci_scan_slot(struct pci_bus *bus, int devfn);
struct pci_dev * pci_scan_single_device(struct pci_bus *bus, int devfn);
+unsigned int pci_scan_child_bus(struct pci_bus *bus);
void pci_bus_add_devices(struct pci_bus *bus);
void pci_name_device(struct pci_dev *dev);
char *pci_class_name(u32 class);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/