diff options
| author | Linus Torvalds | 2009-12-18 01:57:49 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2009-12-18 01:57:49 +0100 |
| commit | b5c96f89177b460ef89ecd777d5f2fefd4534d3f (patch) | |
| tree | 0cbb456cf76c98d5adfc25b65f0fca4b08d38695 /drivers/usb/host | |
| parent | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | OMAP3: serial - fix bug introduced in (diff) | |
| download | kernel-qcow2-linux-b5c96f89177b460ef89ecd777d5f2fefd4534d3f.tar.gz kernel-qcow2-linux-b5c96f89177b460ef89ecd777d5f2fefd4534d3f.tar.xz kernel-qcow2-linux-b5c96f89177b460ef89ecd777d5f2fefd4534d3f.zip | |
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 @@ #include <linux/platform_device.h> #include <linux/clk.h> #include <linux/gpio.h> -#include <mach/usb.h> +#include <plat/usb.h> /* * OMAP USBHOST Register addresses: VIRTUAL ADDRESSES |