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/isdn | |
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/isdn')
-rw-r--r-- | drivers/isdn/hardware/mISDN/hfcsusb.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c index 71a8eb6ef71..0e1f4d5b977 100644 --- a/drivers/isdn/hardware/mISDN/hfcsusb.c +++ b/drivers/isdn/hardware/mISDN/hfcsusb.c | |||
@@ -2154,30 +2154,4 @@ static struct usb_driver hfcsusb_drv = { | |||
2154 | .disconnect = hfcsusb_disconnect, | 2154 | .disconnect = hfcsusb_disconnect, |
2155 | }; | 2155 | }; |
2156 | 2156 | ||
2157 | static int __init | 2157 | module_usb_driver(hfcsusb_drv); |
2158 | hfcsusb_init(void) | ||
2159 | { | ||
2160 | printk(KERN_INFO DRIVER_NAME " driver Rev. %s debug(0x%x) poll(%i)\n", | ||
2161 | hfcsusb_rev, debug, poll); | ||
2162 | |||
2163 | if (usb_register(&hfcsusb_drv)) { | ||
2164 | printk(KERN_INFO DRIVER_NAME | ||
2165 | ": Unable to register hfcsusb module at usb stack\n"); | ||
2166 | return -ENODEV; | ||
2167 | } | ||
2168 | |||
2169 | return 0; | ||
2170 | } | ||
2171 | |||
2172 | static void __exit | ||
2173 | hfcsusb_cleanup(void) | ||
2174 | { | ||
2175 | if (debug & DBG_HFC_CALL_TRACE) | ||
2176 | printk(KERN_INFO DRIVER_NAME ": %s\n", __func__); | ||
2177 | |||
2178 | /* unregister Hardware */ | ||
2179 | usb_deregister(&hfcsusb_drv); /* release our driver */ | ||
2180 | } | ||
2181 | |||
2182 | module_init(hfcsusb_init); | ||
2183 | module_exit(hfcsusb_cleanup); | ||