xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Greg Kroah-Hartman
2012-01-06 11:42:52 -08:00
parent 805a6af8db ea04018e6b
commit ff4b8a57f0
518 changed files with 3167 additions and 6887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/can/usb/ems_usb.c
View File

@@ -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);

23
drivers/net/can/usb/esd_usb2.c
View File

@@ -1108,25 +1108,4 @@ static struct usb_driver esd_usb2_driver = {
.id_table = esd_usb2_table,
};
static int __init esd_usb2_init(void)
{
int err;
/* register this driver with the USB subsystem */
err = usb_register(&esd_usb2_driver);
if (err) {
err("usb_register failed. Error number %d\n", err);
return err;
}
return 0;
}
module_init(esd_usb2_init);
static void __exit esd_usb2_exit(void)
{
/* deregister this driver with the USB subsystem */
usb_deregister(&esd_usb2_driver);
}
module_exit(esd_usb2_exit);
module_usb_driver(esd_usb2_driver);