diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-15 05:14:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-15 05:14:00 -0800 |
| commit | 9e8b550efd8d24d32c1aaf6e98f54391be65811f (patch) | |
| tree | 02af4c1b2f819091abbea6f8fb3077520cdc4c0b /include/linux | |
| parent | e89de275d22ff44b8908aeff3a9f2a699965eb7c (diff) | |
| parent | 4586da2a0fd333fa996baa2d606e1072cfb1e2aa (diff) | |
Merge bk://gkernel.bkbits.net/libata-2.5
into ppc970.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/libata.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 20dc26522c15..0d10e7df6771 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -28,7 +28,6 @@ #include <asm/io.h> #include <linux/ata.h> - /* * compile-time options */ @@ -82,7 +81,7 @@ enum { ATA_SHT_EMULATED = 1, ATA_SHT_CMD_PER_LUN = 1, ATA_SHT_THIS_ID = -1, - ATA_SHT_USE_CLUSTERING = 1, + ATA_SHT_USE_CLUSTERING = 0, /* struct ata_device stuff */ ATA_DFLAG_LBA48 = (1 << 0), /* device supports LBA48 */ @@ -251,7 +250,7 @@ struct ata_queued_cmd { struct ata_port *ap; struct ata_device *dev; - struct scsi_cmnd *scsicmd; + struct scsi_cmnd *scsicmd; void (*scsidone)(struct scsi_cmnd *); struct list_head node; |