From: Gabor Juhos Date: Mon, 14 Jan 2013 17:53:55 +0000 (+0000) Subject: generic: remove EHCI platform driver fix from 3.8 X-Git-Tag: v19.07.0-rc1~22239 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=78dc69e1d410881ff2957abd84f326c0ab4afed7;p=openwrt%2Fstaging%2Fhauke.git generic: remove EHCI platform driver fix from 3.8 It is not needed on 3.8. Signed-off-by: Gabor Juhos SVN-Revision: 35160 --- diff --git a/target/linux/generic/patches-3.8/801-usb-ehci-multiple-platform-driver-fix.patch b/target/linux/generic/patches-3.8/801-usb-ehci-multiple-platform-driver-fix.patch deleted file mode 100644 index e803044475..0000000000 --- a/target/linux/generic/patches-3.8/801-usb-ehci-multiple-platform-driver-fix.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/drivers/usb/host/ehci-hcd.c -+++ b/drivers/usb/host/ehci-hcd.c -@@ -1336,12 +1336,12 @@ MODULE_LICENSE ("GPL"); - - #ifdef CONFIG_USB_EHCI_HCD_PLATFORM - #include "ehci-platform.c" --#define PLATFORM_DRIVER ehci_platform_driver -+#define EHCI_PLATFORM_DRIVER ehci_platform_driver - #endif - - #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \ - !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \ -- !defined(XILINX_OF_PLATFORM_DRIVER) -+ !defined(XILINX_OF_PLATFORM_DRIVER) && !defined(EHCI_PLATFORM_DRIVER) - #error "missing bus glue for ehci-hcd" - #endif - -@@ -1401,8 +1401,19 @@ static int __init ehci_hcd_init(void) - if (retval < 0) - goto clean4; - #endif -+ -+#ifdef EHCI_PLATFORM_DRIVER -+ retval = platform_driver_register(&EHCI_PLATFORM_DRIVER); -+ if (retval < 0) -+ goto clean5; -+#endif -+ - return retval; - -+#ifdef EHCI_PLATFORM_DRIVER -+ platform_driver_unregister(&EHCI_PLATFORM_DRIVER); -+clean5: -+#endif - #ifdef XILINX_OF_PLATFORM_DRIVER - /* platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER); */ - clean4: -@@ -1435,6 +1446,9 @@ module_init(ehci_hcd_init); - - static void __exit ehci_hcd_cleanup(void) - { -+#ifdef EHCI_PLATFORM_DRIVER -+ platform_driver_unregister(&EHCI_PLATFORM_DRIVER); -+#endif - #ifdef XILINX_OF_PLATFORM_DRIVER - platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER); - #endif