Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / i2c / chips / twl4030-usb.c

diff --git a/drivers/i2c/chips/twl4030-usb.c b/drivers/i2c/chips/twl4030-usb.c
index d9760e41631fc7cf80a6514ee40bc910fed5778d..2906b82cebbfe9827e3d39f5a69b1839bf455e9c 100644 (file)
--- a/drivers/i2c/chips/twl4030-usb.c
+++ b/drivers/i2c/chips/twl4030-usb.c
@@ -33,7 +33,7 @@
 #include <linux/usb/gadget.h>
 #include <linux/usb/otg.h>
 #include <linux/i2c/twl4030.h>
-#include <asm/arch/usb.h>
+#include <mach/usb.h>
 
 /* Register defines */