libata-acpi: s/CONFIG_SATA_ACPI/CONFIG_ATA_ACPI/

ACPI applies to both SATA and PATA.  Drop the 'S' from the config
variable.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

4 files changed, 16 insertions, 16 deletions

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index f031b8732330..8e136ff013f4 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -24,6 +24,19 @@ config ATA_NONSTANDARD
        bool
        default n
 
+config ATA_ACPI
+        bool
+        depends on ACPI && PCI
+        default y
+        help
+          This option adds support for ATA-related ACPI objects.
+          These ACPI objects add the ability to retrieve taskfiles
+          from the ACPI BIOS and write them to the disk controller.
+          These objects may be related to performance, security,
+          power management, or other areas.
+          You can disable this at kernel boot time by using the
+          option libata.noacpi=1
+
 config SATA_AHCI
         tristate "AHCI SATA support"
         depends on PCI
@@ -157,19 +170,6 @@ config SATA_INIC162X
         help
           This option enables support for Initio 162x Serial ATA.
 
-config SATA_ACPI
-        bool
-        depends on ACPI && PCI
-        default y
-        help
-          This option adds support for SATA-related ACPI objects.
-          These ACPI objects add the ability to retrieve taskfiles
-          from the ACPI BIOS and write them to the disk controller.
-          These objects may be related to performance, security,
-          power management, or other areas.
-          You can disable this at kernel boot time by using the
-          option libata.noacpi=1
-
 config PATA_ALI
         tristate "ALi PATA support (Experimental)"
         depends on PCI && EXPERIMENTAL
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index 6f42a0e2812d..8149c68ac2c7 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -69,4 +69,4 @@ obj-$(CONFIG_ATA_GENERIC)	+= ata_generic.o
 obj-$(CONFIG_PATA_LEGACY)       += pata_legacy.o
 
 libata-objs     := libata-core.o libata-scsi.o libata-sff.o libata-eh.o
-libata-$(CONFIG_SATA_ACPI) += libata-acpi.o
+libata-$(CONFIG_ATA_ACPI)       += libata-acpi.o
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 316bf8ae4536..49ec182e5057 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -97,7 +97,7 @@ extern int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg);
 extern struct ata_port *ata_port_alloc(struct ata_host *host);
 
 /* libata-acpi.c */
-#ifdef CONFIG_SATA_ACPI
+#ifdef CONFIG_ATA_ACPI
 extern int ata_acpi_exec_tfs(struct ata_port *ap);
 extern int ata_acpi_push_id(struct ata_port *ap, unsigned int ix);
 #else
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 90abcdc3d4ef..27d936279574 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -458,7 +458,7 @@ struct ata_device {
         struct ata_ering        ering;
         int                     spdn_cnt;
         unsigned int            horkage;        /* List of broken features */
-#ifdef CONFIG_SATA_ACPI
+#ifdef CONFIG_ATA_ACPI
         /* ACPI objects info */
         acpi_handle obj_handle;
 #endif