diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-24 07:19:00 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-24 07:19:00 +0100 |
| commit | fcb11235d3910c39afece52f6e106a9ca565d34b (patch) | |
| tree | 07412f9c367f5f9bf6ad7ccd6fa8146c4aba68af /drivers/ata | |
| parent | Merge branch 'tc1100-wmi' into release (diff) | |
| parent | hp-wmi: Fix two memleaks (diff) | |
| download | linux-fcb11235d3910c39afece52f6e106a9ca565d34b.tar.xz linux-fcb11235d3910c39afece52f6e106a9ca565d34b.zip | |
Merge branch 'misc-2.6.33' into release
Diffstat (limited to 'drivers/ata')
| -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. |