diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 15:32:42 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 15:32:42 -0400 |
| commit | 467a3ca5cab64a16b5ec46ebb1895c84c280dcfe (patch) | |
| tree | 68096d5b17e884d270420d50e466186c73019830 /include/scsi/scsi_device.h | |
| parent | 40c9f61eae9098212b6906f29f30f08f7a19b5e2 (diff) | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
Merge branch 'v3.6-rc7' into tty-next
This is to sync up on Linus's branch to get the other tty and core changes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 { | |||
| 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 */ |