diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-02 02:46:10 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-02 02:46:10 +0100 |
| commit | 884897e6a10a86de0e611a76f4bf3fd0068a672c (patch) | |
| tree | 019689fb9d129404af1efba4df10975bc9e0a57a /drivers/usb | |
| parent | Merge branch 'imx/devel' into next/dt (diff) | |
| parent | ARM: highbank: add suspend support (diff) | |
| download | linux-884897e6a10a86de0e611a76f4bf3fd0068a672c.tar.xz linux-884897e6a10a86de0e611a76f4bf3fd0068a672c.zip | |
Merge branch 'highbank/soc' into next/soc
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-omap2/board-generic.c
arch/arm/plat-mxc/include/mach/gpio.h
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/ohci-pnx4008.c | 2 | ||||
| -rw-r--r-- | drivers/usb/musb/davinci.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c index 653d6a60edb5..d1b41933199e 100644 --- a/drivers/usb/host/ohci-pnx4008.c +++ b/drivers/usb/host/ohci-pnx4008.c @@ -26,7 +26,7 @@ #include <mach/platform.h> #include <mach/irqs.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #define USB_CTRL IO_ADDRESS(PNX4008_PWRMAN_BASE + 0x64) diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index 8bdf25a8b023..f9a3f62a83b5 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c @@ -35,7 +35,7 @@ #include <mach/hardware.h> #include <mach/memory.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <mach/cputype.h> #include <asm/mach-types.h> |