diff options
author | Len Brown <len.brown@intel.com> | 2008-10-23 03:28:38 (GMT) |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-10-23 03:28:38 (GMT) |
commit | 5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (patch) | |
tree | 1999a7e6d242198d48f0089c7995a50f339fa3e4 /drivers/acpi/Kconfig | |
parent | 530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff) | |
parent | e3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff) | |
download | linux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.tar.xz |
Merge branch 'misc' into test
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r-- | drivers/acpi/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 3919d6d..cbfc58d 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -42,7 +42,7 @@ if ACPI config ACPI_SLEEP bool - depends on PM_SLEEP + depends on SUSPEND || HIBERNATION default y config ACPI_PROCFS @@ -252,7 +252,7 @@ config ACPI_ASUS config ACPI_TOSHIBA tristate "Toshiba Laptop Extras" - depends on X86 + depends on X86 && INPUT select BACKLIGHT_CLASS_DEVICE ---help--- This driver adds support for access to certain system settings |