diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-01-14 17:53:55 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2013-01-14 17:53:55 +0000 |
commit | e789d6289afb505817501ee0bd013c8e4ef4ff34 (patch) | |
tree | dd6c483fc34e0d29a3feca3011b22a08d60c4868 /target/linux | |
parent | 766ba6e58aedc52d4df9a4e8367e3fb9022e74f3 (diff) | |
download | upstream-e789d6289afb505817501ee0bd013c8e4ef4ff34.tar.gz upstream-e789d6289afb505817501ee0bd013c8e4ef4ff34.tar.bz2 upstream-e789d6289afb505817501ee0bd013c8e4ef4ff34.zip |
generic: remove EHCI platform driver fix from 3.8
It is not needed on 3.8.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35160 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r-- | target/linux/generic/patches-3.8/801-usb-ehci-multiple-platform-driver-fix.patch | 47 |
1 files changed, 0 insertions, 47 deletions
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 |