Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc

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

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 9a061ac..6617c9f 100644 (file)
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -108,6 +108,8 @@ enum {
        ATA_PIO5                = ATA_PIO4 | (1 << 5),
        ATA_PIO6                = ATA_PIO5 | (1 << 6),
 
+       ATA_PIO4_ONLY           = (1 << 4),
+
        ATA_SWDMA0              = (1 << 0),
        ATA_SWDMA1              = ATA_SWDMA0 | (1 << 1),
        ATA_SWDMA2              = ATA_SWDMA1 | (1 << 2),
@@ -117,6 +119,8 @@ enum {
        ATA_MWDMA0              = (1 << 0),
        ATA_MWDMA1              = ATA_MWDMA0 | (1 << 1),
        ATA_MWDMA2              = ATA_MWDMA1 | (1 << 2),
+       ATA_MWDMA3              = ATA_MWDMA2 | (1 << 3),
+       ATA_MWDMA4              = ATA_MWDMA3 | (1 << 4),
 
        ATA_MWDMA12_ONLY        = (1 << 1) | (1 << 2),
        ATA_MWDMA2_ONLY         = (1 << 2),
@@ -131,6 +135,8 @@ enum {
        ATA_UDMA7               = ATA_UDMA6 | (1 << 7),
        /* ATA_UDMA7 is just for completeness... doesn't exist (yet?).  */
 
+       ATA_UDMA24_ONLY         = (1 << 2) | (1 << 4),
+
        ATA_UDMA_MASK_40C       = ATA_UDMA2,    /* udma0-2 */
 
        /* DMA-related */
@@ -244,8 +250,6 @@ enum {
        ATA_CMD_MEDIA_UNLOCK    = 0xDF,
        /* marked obsolete in the ATA/ATAPI-7 spec */
        ATA_CMD_RESTORE         = 0x10,
-       /* EXABYTE specific */
-       ATA_EXABYTE_ENABLE_NEST = 0xF0,
 
        /* READ_LOG_EXT pages */
        ATA_LOG_SATA_NCQ        = 0x10,