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

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
index 493fb3f38dc3..6a7939b16a1c 100644
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
@@ -77,12 +77,6 @@ static void tiocx_bus_release(struct device *dev)
         kfree(to_cx_dev(dev));
 }
 
-struct bus_type tiocx_bus_type = {
-        .name = "tiocx",
-        .match = tiocx_match,
-        .uevent = tiocx_uevent,
-};
-
 /**
  * cx_device_match - Find cx_device in the id table.
  * @ids: id table from driver
@@ -149,6 +143,14 @@ static int cx_driver_remove(struct device *dev)
         return 0;
 }
 
+struct bus_type tiocx_bus_type = {
+        .name = "tiocx",
+        .match = tiocx_match,
+        .uevent = tiocx_uevent,
+        .probe = cx_device_probe,
+        .remove = cx_driver_remove,
+};
+
 /**
  * cx_driver_register - Register the driver.
  * @cx_driver: driver table (cx_drv struct) from driver
@@ -162,8 +164,6 @@ int cx_driver_register(struct cx_drv *cx_driver)
 {
         cx_driver->driver.name = cx_driver->name;
         cx_driver->driver.bus = &tiocx_bus_type;
-        cx_driver->driver.probe = cx_device_probe;
-        cx_driver->driver.remove = cx_driver_remove;
 
         return driver_register(&cx_driver->driver);
 }