diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-01-06 15:49:08 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-06 15:49:08 +0900 |
| commit | fa94ddea2b29fdda7640672c8a933dbd901f0278 (patch) | |
| tree | 4e9204f1438f5ed44bff31e2abee598ad775321d /drivers/ata/Kconfig | |
| parent | 6fbfe8d7cd7e71ceb281c5a1b9de6e5e0dfbf1c8 (diff) | |
| parent | 56d45b62ce622a003da972428fdbba2b42102efb (diff) | |
Merge branch 'master' into sh/hw-breakpoints
Diffstat (limited to 'drivers/ata/Kconfig')
| -rw-r--r-- | drivers/ata/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 85844d053846..56c6374a3989 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -40,7 +40,6 @@ config ATA_VERBOSE_ERROR config ATA_ACPI bool "ATA ACPI Support" depends on ACPI && PCI - select ACPI_DOCK default y help This option adds support for ATA-related ACPI objects. |