---

yaml --- r: 234991 b: refs/heads/master c: 1a0f6b7 h: refs/heads/master i: 234989: 6bb27a2 234987: e8d9c07 234983: 22052e0 234975: c9d9bd1 v: v3
git-mirror · Mar 2, 2011 · 99b9f5e · 99b9f5e
1 parent c4d7a8d
commit 99b9f5e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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