diff --git a/[refs] b/[refs] index 9a1756495b29..7334b1e187b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cbe056f6c467e7395d5aec39aceec47812eb98e +refs/heads/master: 1a0f6b7ecdcd810f8991ea26c95d93ff965e8f41 diff --git a/trunk/drivers/ata/ahci.h b/trunk/drivers/ata/ahci.h index fd75844fb009..ccaf08122058 100644 --- a/trunk/drivers/ata/ahci.h +++ b/trunk/drivers/ata/ahci.h @@ -214,8 +214,7 @@ enum { /* ap->flags bits */ AHCI_FLAG_COMMON = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA | - ATA_FLAG_ACPI_SATA | ATA_FLAG_AN | - ATA_FLAG_LPM, + ATA_FLAG_ACPI_SATA | ATA_FLAG_AN, ICH_MAP = 0x90, /* ICH MAP register */ diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h index 26d80479c75f..71333aa39532 100644 --- a/trunk/include/linux/libata.h +++ b/trunk/include/linux/libata.h @@ -194,7 +194,6 @@ enum { ATA_FLAG_ACPI_SATA = (1 << 17), /* need native SATA ACPI layout */ ATA_FLAG_AN = (1 << 18), /* controller supports AN */ ATA_FLAG_PMP = (1 << 19), /* controller supports PMP */ - ATA_FLAG_LPM = (1 << 20), /* driver can handle LPM */ ATA_FLAG_EM = (1 << 21), /* driver supports enclosure * management */ ATA_FLAG_SW_ACTIVITY = (1 << 22), /* driver supports sw activity