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>
This commit is contained in:
@@ -562,17 +562,7 @@ static struct usb_driver ushc_driver = {
|
||||
.disconnect = ushc_disconnect,
|
||||
};
|
||||
|
||||
static int __init ushc_init(void)
|
||||
{
|
||||
return usb_register(&ushc_driver);
|
||||
}
|
||||
module_init(ushc_init);
|
||||
|
||||
static void __exit ushc_exit(void)
|
||||
{
|
||||
usb_deregister(&ushc_driver);
|
||||
}
|
||||
module_exit(ushc_exit);
|
||||
module_usb_driver(ushc_driver);
|
||||
|
||||
MODULE_DESCRIPTION("USB SD Host Controller driver");
|
||||
MODULE_AUTHOR("David Vrabel <david.vrabel@csr.com>");
|
||||
|
Reference in New Issue
Block a user