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

diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index a72c7bfb4090..9697c14b8dc6 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -1115,28 +1115,4 @@ static struct usb_driver ems_usb_driver = {
         .id_table = ems_usb_table,
 };
 
-static int __init ems_usb_init(void)
-{
-        int err;
-
-        printk(KERN_INFO "CPC-USB kernel driver loaded\n");
-
-        /* register this driver with the USB subsystem */
-        err = usb_register(&ems_usb_driver);
-
-        if (err) {
-                err("usb_register failed. Error number %d\n", err);
-                return err;
-        }
-
-        return 0;
-}
-
-static void __exit ems_usb_exit(void)
-{
-        /* deregister this driver with the USB subsystem */
-        usb_deregister(&ems_usb_driver);
-}
-
-module_init(ems_usb_init);
-module_exit(ems_usb_exit);
+module_usb_driver(ems_usb_driver);