PCI: define pci_bus_type and register it on startup

diff --git a/Makefile b/Makefile
index b30bf4575c4c49168c382c7825b1e0af34d24d9f..d067c38ba25d3fd2b4be274985a2307cc022ef65 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -104,8 +104,8 @@ DRIVERS-y :=
 DRIVERS-m :=
 DRIVERS-  :=
 
-DRIVERS-$(CONFIG_ACPI) += drivers/acpi/acpi.o
 DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o
+DRIVERS-$(CONFIG_ACPI) += drivers/acpi/acpi.o
 DRIVERS-$(CONFIG_PARPORT) += drivers/parport/driver.o
 DRIVERS-y += drivers/base/base.o \
        drivers/char/char.o \

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 702542470631d7b8c32fe63265cef99a4fff429c..8ff363949d68a273b2a21b6e7b8c85167bf44629 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -164,6 +164,17 @@ struct device_driver pci_device_driver = {
        resume:         pci_device_resume,
 };
 
+struct bus_type pci_bus_type = {
+       name:   "pci",
+};
+
+static int __init pci_driver_init(void)
+{
+       return bus_register(&pci_bus_type);
+}
+
+subsys_initcall(pci_driver_init);
+
 EXPORT_SYMBOL(pci_match_device);
 EXPORT_SYMBOL(pci_register_driver);
 EXPORT_SYMBOL(pci_unregister_driver);

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index f56278fbbbf9b6400bcab2c02dfcdbac6f93d669..a105a7b862a2b23ef340738d3e7b6bbd0e4b8da1 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -513,6 +513,7 @@ unsigned int __devinit pci_do_scan_bus(struct pci_bus *bus)
        dev0.sysdata = bus->sysdata;
        dev0.dev.parent = bus->dev;
        dev0.dev.driver = &pci_device_driver;
+       dev0.dev.bus = &pci_bus_type;
 
        /* Go find them, Rover! */
        for (devfn = 0; devfn < 0x100; devfn += 8) {

diff --git a/include/linux/pci.h b/include/linux/pci.h
index d138ba50a6784f57c4fe24d2664a20e644c6acbc..f6e3a68a2a0de0b39d4ed420912a34264dc1a38b 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -439,6 +439,7 @@ struct pci_bus {
 
 extern struct list_head pci_root_buses;        /* list of all known PCI buses */
 extern struct list_head pci_devices;   /* list of all devices */
+extern struct bus_type pci_bus_type;
 
 /*
  * Error values that may be returned by PCI functions.