diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-13 11:53:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-13 11:53:56 -0500 |
| commit | 90ac8f7741be4ff66de1f52904f4f67f272f74ce (patch) | |
| tree | d20316f5eb9fe399edd81c14d801602aac64a752 /include | |
| parent | 98684a9d91bceff829b6dc7adf0f662d59cfa6e3 (diff) | |
| parent | 50630195bbdfe1ca775d94cd68a5f18bc1b717e4 (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'include')
| -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? */ |