Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / usb / host / ehci-omap.c

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 8ca21c276ed019a6a4bd1318e09937b3ae4b45ee..8f122e511e7faca12ef737f60b176e30aab70ffa 100644 (file)
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -27,7 +27,7 @@
 
 #include <linux/platform_device.h>
 #include <linux/clk.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 
 #include "ehci-omap.h"