Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (232 commits) USB: Add USB-ID for Multiplex RC serial adapter to cp210x.c xhci: Clean up 32-bit build warnings. USB: update documentation for usbmon usb: usb-storage doesn't support dynamic id currently, the patch disables the feature to fix an oops drivers/usb/class/cdc-acm.c: clear dangling pointer drivers/usb/dwc3/dwc3-pci.c: introduce missing kfree drivers/usb/host/isp1760-if.c: introduce missing kfree usb: option: add ZD Incorporated HSPA modem usb: ch9: fix up MaxStreams helper USB: usb-skeleton.c: cleanup open_count USB: usb-skeleton.c: fix open/disconnect race xhci: Properly handle COMP_2ND_BW_ERR USB: remove dead code from suspend/resume path USB: add quirk for another camera drivers: usb: wusbcore: Fix dependency for USB_WUSB xhci: Better debugging for critical host errors. xhci: Be less verbose during URB cancellation. xhci: Remove debugging about ring structure allocation. xhci: Remove debugging about toggling cycle bits. xhci: Remove debugging for individual transfers. ...
This commit is contained in:
@@ -1924,18 +1924,7 @@ static struct platform_driver imx21_hcd_driver = {
|
||||
.resume = NULL,
|
||||
};
|
||||
|
||||
static int __init imx21_hcd_init(void)
|
||||
{
|
||||
return platform_driver_register(&imx21_hcd_driver);
|
||||
}
|
||||
|
||||
static void __exit imx21_hcd_cleanup(void)
|
||||
{
|
||||
platform_driver_unregister(&imx21_hcd_driver);
|
||||
}
|
||||
|
||||
module_init(imx21_hcd_init);
|
||||
module_exit(imx21_hcd_cleanup);
|
||||
module_platform_driver(imx21_hcd_driver);
|
||||
|
||||
MODULE_DESCRIPTION("i.MX21 USB Host controller");
|
||||
MODULE_AUTHOR("Martin Fuzzey");
|
||||
|
Reference in New Issue
Block a user