Merge branch 'driver-core-next' into Linux 3.2

This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 1 insertions, 45 deletions

diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c
index a989356f693e..16937da31cd8 100644
--- a/drivers/usb/misc/legousbtower.c
+++ b/drivers/usb/misc/legousbtower.c
@@ -1043,51 +1043,7 @@ static void tower_disconnect (struct usb_interface *interface)
         dbg(2, "%s: leave", __func__);
 }
 
-
-
-/**
- *      lego_usb_tower_init
- */
-static int __init lego_usb_tower_init(void)
-{
-        int result;
-        int retval = 0;
-
-        dbg(2, "%s: enter", __func__);
-
-        /* register this driver with the USB subsystem */
-        result = usb_register(&tower_driver);
-        if (result < 0) {
-                err("usb_register failed for the %s driver. Error number %d", __FILE__, result);
-                retval = -1;
-                goto exit;
-        }
-
-        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-               DRIVER_DESC "\n");
-
-exit:
-        dbg(2, "%s: leave, return value %d", __func__, retval);
-
-        return retval;
-}
-
-
-/**
- *      lego_usb_tower_exit
- */
-static void __exit lego_usb_tower_exit(void)
-{
-        dbg(2, "%s: enter", __func__);
-
-        /* deregister this driver with the USB subsystem */
-        usb_deregister (&tower_driver);
-
-        dbg(2, "%s: leave", __func__);
-}
-
-module_init (lego_usb_tower_init);
-module_exit (lego_usb_tower_exit);
+module_usb_driver(tower_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);