Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / drivers / usb / gadget / usbstring.c

diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c
index 3459ea6c6c0b4d7bac7bfbd50dbf1153db0ca27d..878e428a0ec12b3fd45c9298b40fa058220f5881 100644 (file)
--- a/drivers/usb/gadget/usbstring.c
+++ b/drivers/usb/gadget/usbstring.c
@@ -15,7 +15,7 @@
 #include <linux/init.h>
 
 #include <linux/usb/ch9.h>
-#include <linux/usb_gadget.h>
+#include <linux/usb/gadget.h>
 
 #include <asm/unaligned.h>