From 49399bebdd67fa44a5b2e02d9d4ccd413420b1d2 Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 5 Jan 2006 14:39:24 +0000 Subject: [PATCH] --- yaml --- r: 18388 b: refs/heads/master c: 4866b124a1ded3b94b0cea0bd543f46ffa9a3943 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/macintosh/macio_asic.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 288b20ab1eb8..50f996f8a519 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30226f8199cb7f5ace767f65bcebb85941612dfc +refs/heads/master: 4866b124a1ded3b94b0cea0bd543f46ffa9a3943 diff --git a/trunk/drivers/macintosh/macio_asic.c b/trunk/drivers/macintosh/macio_asic.c index 2a545ceb523b..ed6d3174d660 100644 --- a/trunk/drivers/macintosh/macio_asic.c +++ b/trunk/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);