diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 22:15:52 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 22:15:52 -0500 |
| commit | 8b132f4ee7304fec4fa27dec67879bc0172e916a (patch) | |
| tree | b5e5c9b347afef51007394ba1b01e434074e299a /include/linux | |
| parent | d22a8ccff761c81f2930bd90fa5712e51a0e9a62 (diff) | |
| parent | 65ab592dc5b34caebabfe1340e7c18f52a785079 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/libata.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index f2dbb684ce9e..41ea7dbc1755 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -122,6 +122,7 @@ enum { | |||
| 122 | ATA_FLAG_NOINTR = (1 << 9), /* FIXME: Remove this once | 122 | ATA_FLAG_NOINTR = (1 << 9), /* FIXME: Remove this once |
| 123 | * proper HSM is in place. */ | 123 | * proper HSM is in place. */ |
| 124 | ATA_FLAG_DEBUGMSG = (1 << 10), | 124 | ATA_FLAG_DEBUGMSG = (1 << 10), |
| 125 | ATA_FLAG_NO_ATAPI = (1 << 11), /* No ATAPI support */ | ||
| 125 | 126 | ||
| 126 | ATA_QCFLAG_ACTIVE = (1 << 1), /* cmd not yet ack'd to scsi lyer */ | 127 | ATA_QCFLAG_ACTIVE = (1 << 1), /* cmd not yet ack'd to scsi lyer */ |
| 127 | ATA_QCFLAG_SG = (1 << 3), /* have s/g table? */ | 128 | ATA_QCFLAG_SG = (1 << 3), /* have s/g table? */ |