summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergei Shtylyov <sshtylyov@ru.mvista.com>2011-02-04 20:08:22 +0100
committerJeff Garzik <jgarzik@redhat.com>2011-03-02 08:36:46 +0100
commit1a0f6b7ecdcd810f8991ea26c95d93ff965e8f41 (patch)
treebb1abb63a075726081a94794b3b712c5ac6e5ffd
parentlibata: remove ATA_FLAG_NO_LEGACY (diff)
downloadlinux-1a0f6b7ecdcd810f8991ea26c95d93ff965e8f41.tar.xz
linux-1a0f6b7ecdcd810f8991ea26c95d93ff965e8f41.zip
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>
-rw-r--r--drivers/ata/ahci.h3
-rw-r--r--include/linux/libata.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index fd75844fb009..ccaf08122058 100644
--- 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 26d80479c75f..71333aa39532 100644
--- 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