summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/usb-ehci.c
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2010-08-11 03:27:12 -0400
committerNicolas Pitre <nicolas.pitre@linaro.org>2010-08-11 03:27:12 -0400
commitf9baa031dd6bedc6d4b39e254e3b76cd2c37769b (patch)
tree216e51a0dc73b76f8e7be6648ecf4ee7dbbceec1 /arch/arm/mach-omap2/usb-ehci.c
parent21ee0ab5fa80eb7307079e1a126f642fe7a937a6 (diff)
parentd21872b3683ff37f73c68993749a6e6aeeaed265 (diff)
Merge commit 'd21872b'linaro_merge_100811
Diffstat (limited to 'arch/arm/mach-omap2/usb-ehci.c')
-rw-r--r--arch/arm/mach-omap2/usb-ehci.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/usb-ehci.c b/arch/arm/mach-omap2/usb-ehci.c
index d72d1ac3033..b11bf385d36 100644
--- a/arch/arm/mach-omap2/usb-ehci.c
+++ b/arch/arm/mach-omap2/usb-ehci.c
@@ -23,7 +23,6 @@
#include <linux/dma-mapping.h>
#include <asm/io.h>
-#include <plat/mux.h>
#include <mach/hardware.h>
#include <mach/irqs.h>