diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-20 10:26:31 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-20 10:26:31 -0800 |
| commit | 6166805c3de539a41cfcae39026c5bc273d7c6aa (patch) | |
| tree | b7ed52d9c2f672d4c8b6f9434fb6a19e8e859a16 /drivers/usb/host/ehci-hcd.c | |
| parent | 04867125e154fdc6dc88024b49557c30adde2502 (diff) | |
| download | linux-6166805c3de539a41cfcae39026c5bc273d7c6aa.tar.bz2 | |
Revert "USB: EHCI: make ehci-vt8500 a separate driver"
This reverts commit d57ada0c37ecf836259c205442c15c7679a6dc3e.
All of these are wrong and need to be reverted for now.
Cc: Manjunath Goudar <manjunath.goudar@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Tony Prisk <linux@prisktech.co.nz>
Cc: Alexey Charkov <alchark@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 487ebb892bc2..b416a3fc9959 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1292,6 +1292,11 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_octeon_driver #endif +#ifdef CONFIG_ARCH_VT8500 +#include "ehci-vt8500.c" +#define PLATFORM_DRIVER vt8500_ehci_driver +#endif + #ifdef CONFIG_PLAT_SPEAR #include "ehci-spear.c" #define PLATFORM_DRIVER spear_ehci_hcd_driver @@ -1342,7 +1347,6 @@ MODULE_LICENSE ("GPL"); !IS_ENABLED(CONFIG_USB_CHIPIDEA_HOST) && \ !IS_ENABLED(CONFIG_USB_EHCI_MXC) && \ !defined(PLATFORM_DRIVER) && \ - !IS_ENABLED(CONFIG_ARCH_VT8500) && \ !defined(PS3_SYSTEM_BUS_DRIVER) && \ !defined(OF_PLATFORM_DRIVER) && \ !defined(XILINX_OF_PLATFORM_DRIVER) |