summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-17 16:57:49 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-17 16:57:49 -0800
commitb5c96f89177b460ef89ecd777d5f2fefd4534d3f (patch)
tree0cbb456cf76c98d5adfc25b65f0fca4b08d38695 /drivers/usb
parente82b1dae2a8730c89e2a30c5c28562ef066f39d9 (diff)
parentf2eeeae06a41d4f9c90f8382cc0ef1d35888d09a (diff)
downloadlinux-b5c96f89177b460ef89ecd777d5f2fefd4534d3f.tar.bz2
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')
-rw-r--r--drivers/usb/host/ehci-omap.c2
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