diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:46:42 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:46:42 -0400 |
| commit | efa62e1355f0495f37f1296754b8880947c8da72 (patch) | |
| tree | c07af29f8baf2e6f4ed3bedbe46d405924edd530 /drivers/usb | |
| parent | 107532920226a37e595697959b2a6a823cfa2497 (diff) | |
| parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
Merge branch 'depends/rmk/gpio' into next/devel
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 @@ | |||
| 26 | 26 | ||
| 27 | #include <mach/platform.h> | 27 | #include <mach/platform.h> |
| 28 | #include <mach/irqs.h> | 28 | #include <mach/irqs.h> |
| 29 | #include <mach/gpio.h> | 29 | #include <asm/gpio.h> |
| 30 | 30 | ||
| 31 | #define USB_CTRL IO_ADDRESS(PNX4008_PWRMAN_BASE + 0x64) | 31 | #define USB_CTRL IO_ADDRESS(PNX4008_PWRMAN_BASE + 0x64) |
| 32 | 32 | ||
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 @@ | |||
| 35 | 35 | ||
| 36 | #include <mach/hardware.h> | 36 | #include <mach/hardware.h> |
| 37 | #include <mach/memory.h> | 37 | #include <mach/memory.h> |
| 38 | #include <mach/gpio.h> | 38 | #include <asm/gpio.h> |
| 39 | #include <mach/cputype.h> | 39 | #include <mach/cputype.h> |
| 40 | 40 | ||
| 41 | #include <asm/mach-types.h> | 41 | #include <asm/mach-types.h> |