Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index 2a545ceb523b..ed6d3174d660 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -211,6 +211,9 @@ struct bus_type macio_bus_type = {
        .name    = "macio",
        .match   = macio_bus_match,
        .uevent = macio_uevent,
+       .probe   = macio_device_probe,
+       .remove  = macio_device_remove,
+       .shutdown = macio_device_shutdown,
        .suspend = macio_device_suspend,
        .resume  = macio_device_resume,
        .dev_attrs = macio_dev_attrs,
@@ -528,9 +531,6 @@ int macio_register_driver(struct macio_driver *drv)
         /* initialize common driver fields */
         drv->driver.name = drv->name;
         drv->driver.bus = &macio_bus_type;
-        drv->driver.probe = macio_device_probe;
-        drv->driver.remove = macio_device_remove;
-        drv->driver.shutdown = macio_device_shutdown;
 
         /* register with core */
         count = driver_register(&drv->driver);