Merge ../linux-2.6

[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 934400f69882688802c4ad28993969fb6702be17..cfab6c5c3a4ad147c516e2efa4a0ff69346e5be9 100644 (file)
--- a/drivers/cbus/tahvo-usb.c
+++ b/drivers/cbus/tahvo-usb.c
@@ -33,7 +33,7 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <linux/usb_ch9.h>
+#include <linux/usb/ch9.h>
 #include <linux/usb_gadget.h>
 #include <linux/usb.h>
 #include <linux/usb/otg.h>
@@ -105,7 +105,7 @@ static struct platform_device tahvo_usb_device;
  * OTG related functions
  *
  * These shoud be separated into omap-otg.c driver module, as they are used
- * by various transceivers. These functions are needed in the UDC-only case 
+ * by various transceivers. These functions are needed in the UDC-only case
  * as well. These functions are copied from GPL isp1301_omap.c
  * ---------------------------------------------------------------------------
  */