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

diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c
index 48c166f0d764..5db4ab52061e 100644
--- a/drivers/usb/misc/ldusb.c
+++ b/drivers/usb/misc/ldusb.c
@@ -821,30 +821,5 @@ static struct usb_driver ld_usb_driver = {
         .id_table =     ld_usb_table,
 };
 
-/**
- *      ld_usb_init
- */
-static int __init ld_usb_init(void)
-{
-        int retval;
-
-        /* register this driver with the USB subsystem */
-        retval = usb_register(&ld_usb_driver);
-        if (retval)
-                err("usb_register failed for the %s driver. Error number %d\n", __FILE__, retval);
-
-        return retval;
-}
-
-/**
- *      ld_usb_exit
- */
-static void __exit ld_usb_exit(void)
-{
-        /* deregister this driver with the USB subsystem */
-        usb_deregister(&ld_usb_driver);
-}
-
-module_init(ld_usb_init);
-module_exit(ld_usb_exit);
+module_usb_driver(ld_usb_driver);