3 files changed, 12 insertions, 13 deletions

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 01964b6e6f6b..719e7d237dc8 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -20,16 +20,6 @@
 
 #include <acpi/acpi_bus.h>
 
-enum {
-        ATA_ACPI_FILTER_SETXFER = 1 << 0,
-        ATA_ACPI_FILTER_LOCK    = 1 << 1,
-        ATA_ACPI_FILTER_DIPM    = 1 << 2,
-
-        ATA_ACPI_FILTER_DEFAULT = ATA_ACPI_FILTER_SETXFER |
-                                  ATA_ACPI_FILTER_LOCK |
-                                  ATA_ACPI_FILTER_DIPM,
-};
-
 static unsigned int ata_acpi_gtf_filter = ATA_ACPI_FILTER_DEFAULT;
 module_param_named(acpi_gtf_filter, ata_acpi_gtf_filter, int, 0644);
 MODULE_PARM_DESC(acpi_gtf_filter, "filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freeze lock, 0x4=DIPM)");
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 6299a259ed19..7c5beafa972c 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -334,9 +334,9 @@ enum {
         SETFEATURES_SATA_DISABLE = 0x90, /* Disable use of SATA feature */
 
         /* SETFEATURE Sector counts for SATA features */
-        SATA_AN                 = 0x05,  /* Asynchronous Notification */
-        SATA_DIPM               = 0x03,  /* Device Initiated Power Management */
-        SATA_FPDMA_AA           = 0x02,  /* DMA Setup FIS Auto-Activate */
+        SATA_FPDMA_AA           = 0x02, /* FPDMA Setup FIS Auto-Activate */
+        SATA_DIPM               = 0x03, /* Device Initiated Power Management */
+        SATA_AN                 = 0x05, /* Asynchronous Notification */
 
         /* feature values for SET_MAX */
         ATA_SET_MAX_ADDR        = 0x00,
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 76319bf03e37..5b2f7491fb26 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -418,6 +418,15 @@ enum {
                                   ATA_TIMING_ACTIVE | ATA_TIMING_RECOVER |
                                   ATA_TIMING_DMACK_HOLD | ATA_TIMING_CYCLE |
                                   ATA_TIMING_UDMA,
+
+        /* ACPI constants */
+        ATA_ACPI_FILTER_SETXFER = 1 << 0,
+        ATA_ACPI_FILTER_LOCK    = 1 << 1,
+        ATA_ACPI_FILTER_DIPM    = 1 << 2,
+
+        ATA_ACPI_FILTER_DEFAULT = ATA_ACPI_FILTER_SETXFER |
+                                  ATA_ACPI_FILTER_LOCK |
+                                  ATA_ACPI_FILTER_DIPM,
 };
 
 enum ata_xfer_mask {