diff --git a/[refs] b/[refs]
index 06508d8ec6fd..67dd44093a31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 115bb1ffa54c3934f3617bdd4e4dfc68b11e1e69
+refs/heads/master: 3323b7107ece794eb3e16111b583f5afb6749278
diff --git a/trunk/drivers/usb/gadget/storage_common.c b/trunk/drivers/usb/gadget/storage_common.c
index d7856c599d5a..0a7df3db71f1 100644
--- a/trunk/drivers/usb/gadget/storage_common.c
+++ b/trunk/drivers/usb/gadget/storage_common.c
@@ -54,6 +54,7 @@
 
 
 #include <asm/unaligned.h>
+#include <linux/usb/storage.h>
 
 
 /*
@@ -156,19 +157,6 @@
 #define TYPE_DISK	0x00
 #define TYPE_CDROM	0x05
 
-/* USB protocol value = the transport method */
-#define USB_PR_CBI	0x00		/* Control/Bulk/Interrupt */
-#define USB_PR_CB	0x01		/* Control/Bulk w/o interrupt */
-#define USB_PR_BULK	0x50		/* Bulk-only */
-
-/* USB subclass value = the protocol encapsulation */
-#define USB_SC_RBC	0x01		/* Reduced Block Commands (flash) */
-#define USB_SC_8020	0x02		/* SFF-8020i, MMC-2, ATAPI (CD-ROM) */
-#define USB_SC_QIC	0x03		/* QIC-157 (tape) */
-#define USB_SC_UFI	0x04		/* UFI (floppy) */
-#define USB_SC_8070	0x05		/* SFF-8070i (removable) */
-#define USB_SC_SCSI	0x06		/* Transparent SCSI */
-
 /* Bulk-only data structures */
 
 /* Command Block Wrapper */