diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-10 11:40:43 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-10 11:40:43 -0400 |
commit | 99ac7b577fb5b2d46b35b6f52540a535466e030a (patch) | |
tree | 4da25b56f827fead8c11dbea04bfe00faf9799d6 /drivers/usb/host | |
parent | 524cd267e54a5314aa83f058bc7991b21a1cfad5 (diff) | |
parent | fb584511c4664573097ece7df0de06ad00b713a2 (diff) |
Merge branch 'omap/cleanup2' into next/clk
Dependency for omap/am33xx-clk branch
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/Kconfig | 2 | ||||
-rw-r--r-- | drivers/usb/host/ohci-omap.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 83e58df29fe3..dcfaaa91a3fb 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig | |||
@@ -308,7 +308,7 @@ config USB_OHCI_HCD | |||
308 | 308 | ||
309 | config USB_OHCI_HCD_OMAP1 | 309 | config USB_OHCI_HCD_OMAP1 |
310 | bool "OHCI support for OMAP1/2 chips" | 310 | bool "OHCI support for OMAP1/2 chips" |
311 | depends on USB_OHCI_HCD && (ARCH_OMAP1 || ARCH_OMAP2) | 311 | depends on USB_OHCI_HCD && ARCH_OMAP1 |
312 | default y | 312 | default y |
313 | ---help--- | 313 | ---help--- |
314 | Enables support for the OHCI controller on OMAP1/2 chips. | 314 | Enables support for the OHCI controller on OMAP1/2 chips. |
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 9ce35d0d9d5d..b02c344e2cc9 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c | |||
@@ -20,14 +20,15 @@ | |||
20 | #include <linux/clk.h> | 20 | #include <linux/clk.h> |
21 | #include <linux/gpio.h> | 21 | #include <linux/gpio.h> |
22 | 22 | ||
23 | #include <mach/hardware.h> | ||
24 | #include <asm/io.h> | 23 | #include <asm/io.h> |
25 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
26 | 25 | ||
27 | #include <plat/mux.h> | 26 | #include <plat/mux.h> |
28 | #include <mach/irqs.h> | ||
29 | #include <plat/fpga.h> | 27 | #include <plat/fpga.h> |
30 | #include <plat/usb.h> | 28 | |
29 | #include <mach/hardware.h> | ||
30 | #include <mach/irqs.h> | ||
31 | #include <mach/usb.h> | ||
31 | 32 | ||
32 | 33 | ||
33 | /* OMAP-1510 OHCI has its own MMU for DMA */ | 34 | /* OMAP-1510 OHCI has its own MMU for DMA */ |