diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-10 17:40:43 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-10 17:40:43 +0200 |
| commit | 99ac7b577fb5b2d46b35b6f52540a535466e030a (patch) | |
| tree | 4da25b56f827fead8c11dbea04bfe00faf9799d6 /drivers/usb/host | |
| parent | 524cd267e54a5314aa83f058bc7991b21a1cfad5 (diff) | |
| parent | fb584511c4664573097ece7df0de06ad00b713a2 (diff) | |
| download | linux-99ac7b577fb5b2d46b35b6f52540a535466e030a.tar.bz2 | |
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 config USB_OHCI_HCD_OMAP1 bool "OHCI support for OMAP1/2 chips" - depends on USB_OHCI_HCD && (ARCH_OMAP1 || ARCH_OMAP2) + depends on USB_OHCI_HCD && ARCH_OMAP1 default y ---help--- 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 @@ #include <linux/clk.h> #include <linux/gpio.h> -#include <mach/hardware.h> #include <asm/io.h> #include <asm/mach-types.h> #include <plat/mux.h> -#include <mach/irqs.h> #include <plat/fpga.h> -#include <plat/usb.h> + +#include <mach/hardware.h> +#include <mach/irqs.h> +#include <mach/usb.h> /* OMAP-1510 OHCI has its own MMU for DMA */ |