diff options
| author | Andy Green <andy.green@linaro.org> | 2012-09-07 10:49:58 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-09-07 12:55:47 +0800 |
| commit | 1f04c3ccf017d6aa8ac636ed5058352222767192 (patch) | |
| tree | c8a344667e5eb96ec4249ccd44e27ddd089e4a95 /include/scsi/scsi_device.h | |
| parent | 66cb331f3d3dcf1bf4a89d4456680f6fd4f7022a (diff) | |
| parent | f95b978981a7d154ba40d14c18e8ed5c694e6124 (diff) | |
Merge branch 'stable-linux-3.4.y' into tilt-3.4-up
Conflicts:
arch/arm/kernel/traps.c
arch/arm/vfp/entry.S
drivers/base/power/main.c
drivers/net/tun.c
include/linux/rpmsg.h
net/mac80211/mlme.c
Diffstat (limited to 'include/scsi/scsi_device.h')
| -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 { SD_LAST_BUGGY_SECTORS */ unsigned no_read_disc_info:1; /* Avoid READ_DISC_INFO cmds */ unsigned no_read_capacity_16:1; /* Avoid READ_CAPACITY_16 cmds */ + unsigned try_rc_10_first:1; /* Try READ_CAPACACITY_10 first */ unsigned is_visible:1; /* is the device visible in sysfs */ DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */ |