libata: remove ATA_FLAG_LPM

Commit 6b7ae9545ad9875a289f4191c0216b473e313cb9 (libata: reimplement link power
management) removed the check of ATA_FLAG_LPM but neglected to remove the flag
itself.  Do it now...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index fd75844fb0099ffbcd08ce39aeebe0d98c4dd369..ccaf081220584db609852f7c5d0e8d43ec19de55 100644 (file)
--- a/drivers/ata/ahci.h
+++ b/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/include/linux/libata.h b/include/linux/libata.h
index 26d80479c75f5bcecd66cd5b23f4a7c378061eb0..71333aa39532c53956e061b7985c2b59b8067f81 100644 (file)
--- a/include/linux/libata.h
+++ b/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