diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-08-28 12:40:00 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-08-28 12:40:00 -0400 |
| commit | ba482ef4b16bad5172d2be693d4b2420b84c84e7 (patch) | |
| tree | 8da2f7f2e223a4ba4c64ef30daa7a2c6154f85d7 /drivers/scsi/sr.h | |
| parent | e514385be2b355c1f3fc6385a98a6a0fc04235ae (diff) | |
| parent | 51490c89f95b8581782e9baa855da166441852be (diff) | |
Merge by hand (conflicts in sr.c)
Diffstat (limited to 'drivers/scsi/sr.h')
| -rw-r--r-- | drivers/scsi/sr.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/sr.h b/drivers/scsi/sr.h index 0b3178007203..d2bcd99c272f 100644 --- a/drivers/scsi/sr.h +++ b/drivers/scsi/sr.h | |||
| @@ -33,7 +33,6 @@ typedef struct scsi_cd { | |||
| 33 | struct scsi_device *device; | 33 | struct scsi_device *device; |
| 34 | unsigned int vendor; /* vendor code, see sr_vendor.c */ | 34 | unsigned int vendor; /* vendor code, see sr_vendor.c */ |
| 35 | unsigned long ms_offset; /* for reading multisession-CD's */ | 35 | unsigned long ms_offset; /* for reading multisession-CD's */ |
| 36 | unsigned needs_sector_size:1; /* needs to get sector size */ | ||
| 37 | unsigned use:1; /* is this device still supportable */ | 36 | unsigned use:1; /* is this device still supportable */ |
| 38 | unsigned xa_flag:1; /* CD has XA sectors ? */ | 37 | unsigned xa_flag:1; /* CD has XA sectors ? */ |
| 39 | unsigned readcd_known:1; /* drive supports READ_CD (0xbe) */ | 38 | unsigned readcd_known:1; /* drive supports READ_CD (0xbe) */ |