diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 21:52:42 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 21:52:42 -0400 |
| commit | b194b4250c2b7e9d762823ac6045316fcd4bf4f9 (patch) | |
| tree | 8c54b5004822958ef0a7603e76a4868582e26d7f /include/linux/libata.h | |
| parent | c4052da6f0c01a0b059d125d72bb934d0980b798 (diff) | |
| parent | 59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/linux/libata.h')
| -rw-r--r-- | include/linux/libata.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 0f89f4121fa3..d3f58a796c3a 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -292,10 +292,8 @@ struct ata_device { | |||
| 292 | u8 xfer_mode; | 292 | u8 xfer_mode; |
| 293 | unsigned int xfer_shift; /* ATA_SHIFT_xxx */ | 293 | unsigned int xfer_shift; /* ATA_SHIFT_xxx */ |
| 294 | 294 | ||
| 295 | /* cache info about current transfer mode */ | 295 | unsigned int multi_count; /* sectors count for |
| 296 | u8 xfer_protocol; /* taskfile xfer protocol */ | 296 | READ/WRITE MULTIPLE */ |
| 297 | u8 read_cmd; /* opcode to use on read */ | ||
| 298 | u8 write_cmd; /* opcode to use on write */ | ||
| 299 | 297 | ||
| 300 | /* for CHS addressing */ | 298 | /* for CHS addressing */ |
| 301 | u16 cylinders; /* Number of cylinders */ | 299 | u16 cylinders; /* Number of cylinders */ |