diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 05:31:38 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 05:31:38 -0500 |
| commit | 50401d77ee4904673042dd737eed436067cc23f5 (patch) | |
| tree | c92e6a9cc0f9a81fb5f9a9f8a69b0c7d7397b400 /drivers/usb/host/ehci-hcd.c | |
| parent | 206323c181371f3d5fab36c6d33e1fac09b61082 (diff) | |
| parent | 760efe6910d5743084b586d3d0a3b65aea96fb2f (diff) | |
Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel-stable
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index e9062806d4a2..d0c8f7c03e05 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
| @@ -1216,6 +1216,11 @@ MODULE_LICENSE ("GPL"); | |||
| 1216 | #define PLATFORM_DRIVER ehci_octeon_driver | 1216 | #define PLATFORM_DRIVER ehci_octeon_driver |
| 1217 | #endif | 1217 | #endif |
| 1218 | 1218 | ||
| 1219 | #ifdef CONFIG_USB_CNS3XXX_EHCI | ||
| 1220 | #include "ehci-cns3xxx.c" | ||
| 1221 | #define PLATFORM_DRIVER cns3xxx_ehci_driver | ||
| 1222 | #endif | ||
| 1223 | |||
| 1219 | #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \ | 1224 | #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \ |
| 1220 | !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \ | 1225 | !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \ |
| 1221 | !defined(XILINX_OF_PLATFORM_DRIVER) | 1226 | !defined(XILINX_OF_PLATFORM_DRIVER) |