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

1 files changed, 5 insertions, 4 deletions

diff --git a/arch/xtensa/platform-iss/network.c b/arch/xtensa/platform-iss/network.c
index 96b9bb4a478d..0dc55cc8691b 100644
--- a/arch/xtensa/platform-iss/network.c
+++ b/arch/xtensa/platform-iss/network.c
@@ -616,9 +616,10 @@ void iss_net_user_timer_expire(unsigned long _conn)
 }
 
 
-static struct device_driver iss_net_driver = {
-        .name  = DRIVER_NAME,
-        .bus   = &platform_bus_type,
+static struct platform_driver iss_net_driver = {
+        .driver = {
+                .name  = DRIVER_NAME,
+        },
 };
 
 static int driver_registered;
@@ -669,7 +670,7 @@ static int iss_net_configure(int index, char *init)
         /* sysfs register */
 
         if (!driver_registered) {
-                driver_register(&iss_net_driver);
+                platform_driver_register(&iss_net_driver);
                 driver_registered = 1;
         }