diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 07:48:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 07:48:23 -0700 |
| commit | 74fe030532d779a3774fcc9e1ddce65f3773e156 (patch) | |
| tree | 668da06acf3fc395e5525ba6fc201bcb7de43c29 /drivers/ata/Kconfig | |
| parent | fb00f7629bb94ef9189fc3790b95306a144f58c5 (diff) | |
| parent | 13d93924f13e1989cf27375cd46451475bc70d1d (diff) | |
| download | kernel_samsung_tuna-74fe030532d779a3774fcc9e1ddce65f3773e156.zip kernel_samsung_tuna-74fe030532d779a3774fcc9e1ddce65f3773e156.tar.gz kernel_samsung_tuna-74fe030532d779a3774fcc9e1ddce65f3773e156.tar.bz2 | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: Set flag DOCK_UNDOCKING when triggered via sysfs
Revert "ACPI: video: Ignore devices that aren't present in hardware"
asus_acpi: remove misleading mask
Revert "ACPI: video: Ignore ACPI video devices that aren't present in hardware"
thermal: delete "default y"
thermal: re-document thermal units
Revert "thermal: fix generic thermal I/F for hwmon"
ACPI: fix ATA_ACPI build
ACPI: battery: Don't return -EFAIL on broken packages.
ACPI: lockdep warning on boot, 2.6.25-rc5
Diffstat (limited to 'drivers/ata/Kconfig')
| -rw-r--r-- | drivers/ata/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index e469647..25aba69 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -30,6 +30,7 @@ config ATA_NONSTANDARD config ATA_ACPI bool depends on ACPI && PCI + select ACPI_DOCK default y help This option adds support for ATA-related ACPI objects. |