Merge branch 'misc-2.6.33' into release

This commit is contained in:
Len Brown 2009-12-24 01:19:00 -05:00
commit fcb11235d3
12 changed files with 431 additions and 305 deletions

View file

@ -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.