Merge branch 'upstream'

[linux-2.6-block.git] / include / linux / ata.h

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 630908c9378b45f3ed65bf1118171ff1cbd904dd..065e91e96c27bce163b53d0b62dd918db0fd93c7 100644 (file)
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -187,6 +187,7 @@ enum {
        ATA_TFLAG_DEVICE        = (1 << 2), /* enable r/w to device reg */
        ATA_TFLAG_WRITE         = (1 << 3), /* data dir: host->dev==1 (write) */
        ATA_TFLAG_LBA           = (1 << 4), /* enable LBA */
+       ATA_TFLAG_POLLING       = (1 << 5), /* set nIEN to 1 and use polling */
 };
 
 enum ata_tf_protocols {
@@ -256,6 +257,8 @@ struct ata_taskfile {
          ((u64) (id)[(n) + 1] << 16) | \
          ((u64) (id)[(n) + 0]) )
 
+#define ata_id_cdb_intr(id)    (((id)[0] & 0x60) == 0x20)
+
 static inline int ata_id_current_chs_valid(u16 *id)
 {
        /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command