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

15
sound/usb/6fire/chip.c
View File

@@ -211,22 +211,11 @@ static struct usb_device_id device_table[] = {
MODULE_DEVICE_TABLE(usb, device_table);
static struct usb_driver driver = {
static struct usb_driver usb_driver = {
.name = "snd-usb-6fire",
.probe = usb6fire_chip_probe,
.disconnect = usb6fire_chip_disconnect,
.id_table = device_table,
};
static int __init usb6fire_chip_init(void)
{
return usb_register(&driver);
}
static void __exit usb6fire_chip_cleanup(void)
{
usb_deregister(&driver);
}
module_init(usb6fire_chip_init);
module_exit(usb6fire_chip_cleanup);
module_usb_driver(usb_driver);

13
sound/usb/caiaq/device.c
View File

@@ -538,16 +538,5 @@ static struct usb_driver snd_usb_driver = {
.id_table = snd_usb_id_table,
};
static int __init snd_module_init(void)
{
return usb_register(&snd_usb_driver);
}
static void __exit snd_module_exit(void)
{
usb_deregister(&snd_usb_driver);
}
module_init(snd_module_init)
module_exit(snd_module_exit)
module_usb_driver(snd_usb_driver);

14
sound/usb/misc/ua101.c
View File

@@ -1387,16 +1387,4 @@ static struct usb_driver ua101_driver = {
#endif
};
static int __init alsa_card_ua101_init(void)
{
return usb_register(&ua101_driver);
}
static void __exit alsa_card_ua101_exit(void)
{
usb_deregister(&ua101_driver);
mutex_destroy(&devices_mutex);
}
module_init(alsa_card_ua101_init);
module_exit(alsa_card_ua101_exit);
module_usb_driver(ua101_driver);

14
sound/usb/usx2y/us122l.c
View File

@@ -772,16 +772,4 @@ static struct usb_driver snd_us122l_usb_driver = {
.supports_autosuspend = 1
};
static int __init snd_us122l_module_init(void)
{
return usb_register(&snd_us122l_usb_driver);
}
static void __exit snd_us122l_module_exit(void)
{
usb_deregister(&snd_us122l_usb_driver);
}
module_init(snd_us122l_module_init)
module_exit(snd_us122l_module_exit)
module_usb_driver(snd_us122l_usb_driver);

13
sound/usb/usx2y/usbusx2y.c
View File

@@ -459,15 +459,4 @@ static void usX2Y_usb_disconnect(struct usb_device *device, void* ptr)
}
}
static int __init snd_usX2Y_module_init(void)
{
return usb_register(&snd_usX2Y_usb_driver);
}
static void __exit snd_usX2Y_module_exit(void)
{
usb_deregister(&snd_usX2Y_usb_driver);
}
module_init(snd_usX2Y_module_init)
module_exit(snd_usX2Y_module_exit)
module_usb_driver(snd_usX2Y_usb_driver);