diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 19:57:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 19:57:49 -0500 |
| commit | b5c96f89177b460ef89ecd777d5f2fefd4534d3f (patch) | |
| tree | 0cbb456cf76c98d5adfc25b65f0fca4b08d38695 /drivers/usb/host | |
| parent | e82b1dae2a8730c89e2a30c5c28562ef066f39d9 (diff) | |
| parent | f2eeeae06a41d4f9c90f8382cc0ef1d35888d09a (diff) | |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
OMAP3: serial - fix bug introduced in
mfd: twl: fix twl4030 rename for remaining driver, board files
USB ehci: replace mach header with plat
omap3: Allow EHCI to be built on OMAP3
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/ehci-omap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 12f1ad2fd0e8..74d07f4e8b7d 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | #include <linux/platform_device.h> | 37 | #include <linux/platform_device.h> |
| 38 | #include <linux/clk.h> | 38 | #include <linux/clk.h> |
| 39 | #include <linux/gpio.h> | 39 | #include <linux/gpio.h> |
| 40 | #include <mach/usb.h> | 40 | #include <plat/usb.h> |
| 41 | 41 | ||
| 42 | /* | 42 | /* |
| 43 | * OMAP USBHOST Register addresses: VIRTUAL ADDRESSES | 43 | * OMAP USBHOST Register addresses: VIRTUAL ADDRESSES |