Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / cbus / tahvo-usb.c

diff --git a/drivers/cbus/tahvo-usb.c b/drivers/cbus/tahvo-usb.c
index 65ea14ffe6ef21f64075198b8cd0d66dd44315ad..d8ad836d50153cb8c686ccdd81b66c03ff16e61a 100644 (file)
--- a/drivers/cbus/tahvo-usb.c
+++ b/drivers/cbus/tahvo-usb.c
@@ -45,7 +45,7 @@
 #include <linux/mutex.h>
 
 #include <asm/irq.h>
-#include <asm/arch/usb.h>
+#include <mach/usb.h>
 
 #include "cbus.h"
 #include "tahvo.h"