diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-03 21:12:29 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-03 21:12:29 +0100 |
| commit | fe4bfb30fe5788100a70c0ed96ddd8c6186eb9c4 (patch) | |
| tree | 054d3a37dd62db5f362947c306c12fc3a223571f /drivers/usb/host/ehci-hcd.c | |
| parent | Merge branch 'for-next' of git://gitorious.org/usb/usb into usb-next (diff) | |
| parent | sh: Convert to USB_ARCH_HAS_OHCI/EHCI selects. (diff) | |
| download | linux-fe4bfb30fe5788100a70c0ed96ddd8c6186eb9c4.tar.xz linux-fe4bfb30fe5788100a70c0ed96ddd8c6186eb9c4.zip | |
Merge branch 'sh/ehci' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 into work
* 'sh/ehci' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Convert to USB_ARCH_HAS_OHCI/EHCI selects.
usb: ehci-sh: Add missing ehci helpers.
usb: ehci-sh: Fix up fault in shutdown path.
sh: Add EHCI support for SH7786.
usb: ehci-hcd: Add support for SuperH EHCI.
usb: ohci-sh: Set IRQ as shared.
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 2f06ba471953..abe8336ebffa 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1166,6 +1166,11 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_mxc_driver #endif +#ifdef CONFIG_CPU_SUBTYPE_SH7786 +#include "ehci-sh.c" +#define PLATFORM_DRIVER ehci_hcd_sh_driver +#endif + #ifdef CONFIG_SOC_AU1200 #include "ehci-au1xxx.c" #define PLATFORM_DRIVER ehci_hcd_au1xxx_driver |