diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index b1fd7d6..c7bd4b4 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c @@ -127,9 +127,9 @@ enum { ATA_FLAG_PIO_POLLING, /* ap->flags bits */ - PDC_FLAG_GEN_II = (1 << 24), - PDC_FLAG_SATA_PATA = (1 << 25), /* supports SATA + PATA */ - PDC_FLAG_4_PORTS = (1 << 26), /* 4 ports */ + PDC_FLAG_GEN_II = (1 << 29), + PDC_FLAG_SATA_PATA = (1 << 30), /* supports SATA + PATA */ + PDC_FLAG_4_PORTS = (1 << 31), /* 4 ports */ }; struct pdc_port_priv { diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index e67ce8e..d21afc7 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c @@ -57,9 +57,9 @@ enum { /* * host flags */ - SIL_FLAG_NO_SATA_IRQ = (1 << 28), - SIL_FLAG_RERR_ON_DMA_ACT = (1 << 29), - SIL_FLAG_MOD15WRITE = (1 << 30), + SIL_FLAG_NO_SATA_IRQ = (1 << 29), + SIL_FLAG_RERR_ON_DMA_ACT= (1 << 30), + SIL_FLAG_MOD15WRITE = (1 << 31), SIL_DFL_PORT_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO, diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index 77aa8d7..3852a1c 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c @@ -247,7 +247,7 @@ enum { ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | ATA_FLAG_NCQ | ATA_FLAG_ACPI_SATA | ATA_FLAG_AN | ATA_FLAG_PMP, - SIL24_FLAG_PCIX_IRQ_WOC = (1 << 24), /* IRQ loss errata on PCI-X */ + SIL24_FLAG_PCIX_IRQ_WOC = (1 << 31), /* IRQ loss errata on PCI-X */ IRQ_STAT_4PORTS = 0xf, }; diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c index 7257f2d..3c37ed0 100644 --- a/drivers/ata/sata_svw.c +++ b/drivers/ata/sata_svw.c @@ -59,9 +59,9 @@ enum { /* ap->flags bits */ - K2_FLAG_SATA_8_PORTS = (1 << 24), - K2_FLAG_NO_ATAPI_DMA = (1 << 25), - K2_FLAG_BAR_POS_3 = (1 << 26), + K2_FLAG_SATA_8_PORTS = (1 << 29), + K2_FLAG_NO_ATAPI_DMA = (1 << 30), + K2_FLAG_BAR_POS_3 = (1 << 31), /* Taskfile registers offsets */ K2_SATA_TF_CMD_OFFSET = 0x00, diff --git a/include/linux/libata.h b/include/linux/libata.h index b450a26..42ab418 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -207,7 +207,7 @@ enum { */ ATA_FLAG_DISABLED = (1 << 23), /* port is disabled, ignore it */ - /* bits 24:31 of ap->flags are reserved for LLD specific flags */ + /* bits 29:31 of ap->flags are reserved for LLD specific flags */ /* struct ata_port pflags */ ATA_PFLAG_EH_PENDING = (1 << 0), /* EH pending */