Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel

2 files changed, 10 insertions, 8 deletions

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 4cf31a2ae19c..84c73a300acb 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -268,9 +268,10 @@ void uml_net_user_timer_expire(unsigned long _conn)
 static DEFINE_SPINLOCK(devices_lock);
 static struct list_head devices = LIST_HEAD_INIT(devices);
 
-static struct device_driver uml_net_driver = {
-        .name  = DRIVER_NAME,
-        .bus   = &platform_bus_type,
+static struct platform_driver uml_net_driver = {
+        .driver = {
+                .name  = DRIVER_NAME,
+        },
 };
 static int driver_registered;
 
@@ -317,7 +318,7 @@ static int eth_configure(int n, void *init, char *mac,
 
         /* sysfs register */
         if (!driver_registered) {
-                driver_register(&uml_net_driver);
+                platform_driver_register(&uml_net_driver);
                 driver_registered = 1;
         }
         device->pdev.id = n;
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index b2c86257b0f8..93898917cbe5 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -823,9 +823,10 @@ static int ubd_mc_init(void)
 
 __initcall(ubd_mc_init);
 
-static struct device_driver ubd_driver = {
-        .name  = DRIVER_NAME,
-        .bus   = &platform_bus_type,
+static struct platform_driver ubd_driver = {
+        .driver = {
+                .name  = DRIVER_NAME,
+        },
 };
 
 int ubd_init(void)
@@ -850,7 +851,7 @@ int ubd_init(void)
                 if (register_blkdev(fake_major, "ubd"))
                         return -1;
         }
-        driver_register(&ubd_driver);
+        platform_driver_register(&ubd_driver);
         for (i = 0; i < MAX_DEV; i++) 
                 ubd_add(i);
         return 0;