diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/usb/host/ohci-hcd.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/usb/host/ohci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ohci-hcd.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 24eb74781919..afe59be23645 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
| @@ -1051,6 +1051,11 @@ MODULE_LICENSE ("GPL"); | |||
| 1051 | #define PLATFORM_DRIVER usb_hcd_pnx4008_driver | 1051 | #define PLATFORM_DRIVER usb_hcd_pnx4008_driver |
| 1052 | #endif | 1052 | #endif |
| 1053 | 1053 | ||
| 1054 | #ifdef CONFIG_ARCH_DAVINCI_DA8XX | ||
| 1055 | #include "ohci-da8xx.c" | ||
| 1056 | #define PLATFORM_DRIVER ohci_hcd_da8xx_driver | ||
| 1057 | #endif | ||
| 1058 | |||
| 1054 | #if defined(CONFIG_CPU_SUBTYPE_SH7720) || \ | 1059 | #if defined(CONFIG_CPU_SUBTYPE_SH7720) || \ |
| 1055 | defined(CONFIG_CPU_SUBTYPE_SH7721) || \ | 1060 | defined(CONFIG_CPU_SUBTYPE_SH7721) || \ |
| 1056 | defined(CONFIG_CPU_SUBTYPE_SH7763) || \ | 1061 | defined(CONFIG_CPU_SUBTYPE_SH7763) || \ |