diff options
| author | Tejun Heo <htejun@gmail.com> | 2007-05-05 10:50:38 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-05-11 18:12:42 -0400 |
| commit | e92351bb53c0849fabfa80be53cbf3b0aa166e54 (patch) | |
| tree | cb182d532feb99015e66c7377ecfaf9041153cc2 /drivers/ata/Kconfig | |
| parent | 8575b814097af648dad284bd3087875a11b13d18 (diff) | |
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>
Diffstat (limited to 'drivers/ata/Kconfig')
| -rw-r--r-- | drivers/ata/Kconfig | 26 |
1 files changed, 13 insertions, 13 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 | |||
| 24 | bool | 24 | bool |
| 25 | default n | 25 | default n |
| 26 | 26 | ||
| 27 | config ATA_ACPI | ||
| 28 | bool | ||
| 29 | depends on ACPI && PCI | ||
| 30 | default y | ||
| 31 | help | ||
| 32 | This option adds support for ATA-related ACPI objects. | ||
| 33 | These ACPI objects add the ability to retrieve taskfiles | ||
| 34 | from the ACPI BIOS and write them to the disk controller. | ||
| 35 | These objects may be related to performance, security, | ||
| 36 | power management, or other areas. | ||
| 37 | You can disable this at kernel boot time by using the | ||
| 38 | option libata.noacpi=1 | ||
| 39 | |||
| 27 | config SATA_AHCI | 40 | config SATA_AHCI |
| 28 | tristate "AHCI SATA support" | 41 | tristate "AHCI SATA support" |
| 29 | depends on PCI | 42 | depends on PCI |
| @@ -157,19 +170,6 @@ config SATA_INIC162X | |||
| 157 | help | 170 | help |
| 158 | This option enables support for Initio 162x Serial ATA. | 171 | This option enables support for Initio 162x Serial ATA. |
| 159 | 172 | ||
| 160 | config SATA_ACPI | ||
| 161 | bool | ||
| 162 | depends on ACPI && PCI | ||
| 163 | default y | ||
| 164 | help | ||
| 165 | This option adds support for SATA-related ACPI objects. | ||
| 166 | These ACPI objects add the ability to retrieve taskfiles | ||
| 167 | from the ACPI BIOS and write them to the disk controller. | ||
| 168 | These objects may be related to performance, security, | ||
| 169 | power management, or other areas. | ||
| 170 | You can disable this at kernel boot time by using the | ||
| 171 | option libata.noacpi=1 | ||
| 172 | |||
| 173 | config PATA_ALI | 173 | config PATA_ALI |
| 174 | tristate "ALi PATA support (Experimental)" | 174 | tristate "ALi PATA support (Experimental)" |
| 175 | depends on PCI && EXPERIMENTAL | 175 | depends on PCI && EXPERIMENTAL |
