Linux v2.6.16-rc2

[powerpc.git] / drivers / pci / pci-driver.c

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index a9046d4..0aa14c9 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -380,8 +380,6 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner)
        /* initialize common driver fields */
        drv->driver.name = drv->name;
        drv->driver.bus = &pci_bus_type;
-       drv->driver.probe = pci_device_probe;
-       drv->driver.remove = pci_device_remove;
        /* FIXME, once all of the existing PCI drivers have been fixed to set
         * the pci shutdown function, this test can go away. */
        if (!drv->driver.shutdown)
@@ -502,8 +500,8 @@ void pci_dev_put(struct pci_dev *dev)
 }
 
 #ifndef CONFIG_HOTPLUG
-int pci_hotplug (struct device *dev, char **envp, int num_envp,
-                char *buffer, int buffer_size)
+int pci_uevent(struct device *dev, char **envp, int num_envp,
+              char *buffer, int buffer_size)
 {
        return -ENODEV;
 }
@@ -512,7 +510,9 @@ int pci_hotplug (struct device *dev, char **envp, int num_envp,
 struct bus_type pci_bus_type = {
        .name           = "pci",
        .match          = pci_bus_match,
-       .hotplug        = pci_hotplug,
+       .uevent         = pci_uevent,
+       .probe          = pci_device_probe,
+       .remove         = pci_device_remove,
        .suspend        = pci_device_suspend,
        .resume         = pci_device_resume,
        .dev_attrs      = pci_dev_attrs,