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, 27 deletions

diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c
index 71a8eb6ef71e..0e1f4d5b9774 100644
--- a/drivers/isdn/hardware/mISDN/hfcsusb.c
+++ b/drivers/isdn/hardware/mISDN/hfcsusb.c
@@ -2154,30 +2154,4 @@ static struct usb_driver hfcsusb_drv = {
         .disconnect = hfcsusb_disconnect,
 };
 
-static int __init
-hfcsusb_init(void)
-{
-        printk(KERN_INFO DRIVER_NAME " driver Rev. %s debug(0x%x) poll(%i)\n",
-            hfcsusb_rev, debug, poll);
-
-        if (usb_register(&hfcsusb_drv)) {
-                printk(KERN_INFO DRIVER_NAME
-                    ": Unable to register hfcsusb module at usb stack\n");
-                return -ENODEV;
-        }
-
-        return 0;
-}
-
-static void __exit
-hfcsusb_cleanup(void)
-{
-        if (debug & DBG_HFC_CALL_TRACE)
-                printk(KERN_INFO DRIVER_NAME ": %s\n", __func__);
-
-        /* unregister Hardware */
-        usb_deregister(&hfcsusb_drv);   /* release our driver */
-}
-
-module_init(hfcsusb_init);
-module_exit(hfcsusb_cleanup);
+module_usb_driver(hfcsusb_drv);