diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-27 15:54:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-27 15:54:05 -0400 |
| commit | 47b514cd476db2eca066a2ad31501b079d6c9cce (patch) | |
| tree | ae7cf223281e82a3fc45da725d26bd1b94144837 /include | |
| parent | 2b25679453e55be112a6bf2463fa203d43a5f318 (diff) | |
| parent | 3fcc8f96829776cf181918461923d1e3bbb831a2 (diff) | |
Merge tag 'usb-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg Kroah-Hartman:
"Here are some small USB gadget bugfixes, and a few new USB device ids
added to some drivers for the 3.5-rc5 release.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
* tag 'usb-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
USB: CP210x Add 10 Device IDs
USB: option: Add USB ID for Novatel Ovation MC551
usb: phy: Fix Kconfig dependency for Phy drivers
usb-storage: revert commit afff07e61a52 (Add 090c:1000 to unusal-devs)
SCSI & usb-storage: add try_rc_10_first flag
usb: musb: host: release dma channels if no active io
usb: gadget: lpc32xx_udc: fix build error with debugfs enabled
usb: otg: twl6030-usb: Fix twl writes
USB: option: add id for Cellient MEN-200
usb: dwc3: fix giveback of queued request in ep_dequeue
usb: gadget: Complete fsl qe/udc driver conversion
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/scsi_device.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 6efb2e1416e0..ba9698852321 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h | |||
| @@ -151,6 +151,7 @@ struct scsi_device { | |||
| 151 | SD_LAST_BUGGY_SECTORS */ | 151 | SD_LAST_BUGGY_SECTORS */ |
| 152 | unsigned no_read_disc_info:1; /* Avoid READ_DISC_INFO cmds */ | 152 | unsigned no_read_disc_info:1; /* Avoid READ_DISC_INFO cmds */ |
| 153 | unsigned no_read_capacity_16:1; /* Avoid READ_CAPACITY_16 cmds */ | 153 | unsigned no_read_capacity_16:1; /* Avoid READ_CAPACITY_16 cmds */ |
| 154 | unsigned try_rc_10_first:1; /* Try READ_CAPACACITY_10 first */ | ||
| 154 | unsigned is_visible:1; /* is the device visible in sysfs */ | 155 | unsigned is_visible:1; /* is the device visible in sysfs */ |
| 155 | 156 | ||
| 156 | DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */ | 157 | DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */ |