summaryrefslogtreecommitdiff
path: root/drivers/ata
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-12-24 01:19:00 -0500
committerLen Brown <len.brown@intel.com>2009-12-24 01:19:00 -0500
commitfcb11235d3910c39afece52f6e106a9ca565d34b (patch)
tree07412f9c367f5f9bf6ad7ccd6fa8146c4aba68af /drivers/ata
parent78a5331dddcffabadef024ccc051f7a519b13238 (diff)
parent44ef00e6482e755f36629773abc2aee83a6f53e3 (diff)
Merge branch 'misc-2.6.33' into release
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 85844d05384..56c6374a398 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.