diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/usb/storage/usb.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/usb/storage/usb.h')
| -rw-r--r-- | drivers/usb/storage/usb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h index 2609efb2bd7e..69717134231b 100644 --- a/drivers/usb/storage/usb.h +++ b/drivers/usb/storage/usb.h | |||
| @@ -132,6 +132,7 @@ struct us_data { | |||
| 132 | /* SCSI interfaces */ | 132 | /* SCSI interfaces */ |
| 133 | struct scsi_cmnd *srb; /* current srb */ | 133 | struct scsi_cmnd *srb; /* current srb */ |
| 134 | unsigned int tag; /* current dCBWTag */ | 134 | unsigned int tag; /* current dCBWTag */ |
| 135 | char scsi_name[32]; /* scsi_host name */ | ||
| 135 | 136 | ||
| 136 | /* control and bulk communications data */ | 137 | /* control and bulk communications data */ |
| 137 | struct urb *current_urb; /* USB requests */ | 138 | struct urb *current_urb; /* USB requests */ |