1 files changed, 1 insertions, 30 deletions

diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
index 98b09711a739..0cd1eebc4497 100644
--- a/drivers/usb/storage/usb.h
+++ b/drivers/usb/storage/usb.h
@@ -45,6 +45,7 @@
 #define _USB_H_
 
 #include <linux/usb.h>
+#include <linux/usb_usual.h>
 #include <linux/blkdev.h>
 #include <linux/smp_lock.h>
 #include <linux/completion.h>
@@ -63,38 +64,8 @@ struct us_unusual_dev {
         __u8  useProtocol;
         __u8  useTransport;
         int (*initFunction)(struct us_data *);
-        unsigned int flags;
 };
 
-/*
- * Static flag definitions.  We use this roundabout technique so that the
- * proc_info() routine can automatically display a message for each flag.
- */
-#define US_DO_ALL_FLAGS                                         \
-        US_FLAG(SINGLE_LUN,     0x00000001)                     \
-                /* allow access to only LUN 0 */                \
-        US_FLAG(NEED_OVERRIDE,  0x00000002)                     \
-                /* unusual_devs entry is necessary */           \
-        US_FLAG(SCM_MULT_TARG,  0x00000004)                     \
-                /* supports multiple targets */                 \
-        US_FLAG(FIX_INQUIRY,    0x00000008)                     \
-                /* INQUIRY response needs faking */             \
-        US_FLAG(FIX_CAPACITY,   0x00000010)                     \
-                /* READ CAPACITY response too big */            \
-        US_FLAG(IGNORE_RESIDUE, 0x00000020)                     \
-                /* reported residue is wrong */                 \
-        US_FLAG(BULK32,         0x00000040)                     \
-                /* Uses 32-byte CBW length */                   \
-        US_FLAG(NOT_LOCKABLE,   0x00000080)                     \
-                /* PREVENT/ALLOW not supported */               \
-        US_FLAG(GO_SLOW,        0x00000100)                     \
-                /* Need delay after Command phase */            \
-        US_FLAG(NO_WP_DETECT,   0x00000200)                     \
-                /* Don't check for write-protect */             \
-
-#define US_FLAG(name, value)    US_FL_##name = value ,
-enum { US_DO_ALL_FLAGS };
-#undef US_FLAG
 
 /* Dynamic flag definitions: used in set_bit() etc. */
 #define US_FLIDX_URB_ACTIVE     18  /* 0x00040000  current_urb is in use  */