diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-06 14:42:52 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-06 14:42:52 -0500 |
commit | ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df (patch) | |
tree | d851c923f85566572112d4c0f884cff388a3cc05 /drivers/media/dvb/dvb-usb/ttusb2.c | |
parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
parent | ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e (diff) |
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>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/ttusb2.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/ttusb2.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/media/dvb/dvb-usb/ttusb2.c b/drivers/media/dvb/dvb-usb/ttusb2.c index ea4eab8b396..56acf8e55d5 100644 --- a/drivers/media/dvb/dvb-usb/ttusb2.c +++ b/drivers/media/dvb/dvb-usb/ttusb2.c | |||
@@ -799,26 +799,7 @@ static struct usb_driver ttusb2_driver = { | |||
799 | .id_table = ttusb2_table, | 799 | .id_table = ttusb2_table, |
800 | }; | 800 | }; |
801 | 801 | ||
802 | /* module stuff */ | 802 | module_usb_driver(ttusb2_driver); |
803 | static int __init ttusb2_module_init(void) | ||
804 | { | ||
805 | int result; | ||
806 | if ((result = usb_register(&ttusb2_driver))) { | ||
807 | err("usb_register failed. Error number %d",result); | ||
808 | return result; | ||
809 | } | ||
810 | |||
811 | return 0; | ||
812 | } | ||
813 | |||
814 | static void __exit ttusb2_module_exit(void) | ||
815 | { | ||
816 | /* deregister this driver from the USB subsystem */ | ||
817 | usb_deregister(&ttusb2_driver); | ||
818 | } | ||
819 | |||
820 | module_init (ttusb2_module_init); | ||
821 | module_exit (ttusb2_module_exit); | ||
822 | 803 | ||
823 | MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>"); | 804 | MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>"); |
824 | MODULE_DESCRIPTION("Driver for Pinnacle PCTV 400e DVB-S USB2.0"); | 805 | MODULE_DESCRIPTION("Driver for Pinnacle PCTV 400e DVB-S USB2.0"); |