summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-10-22 23:28:38 -0400
committerLen Brown <len.brown@intel.com>2008-10-22 23:28:38 -0400
commit5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (patch)
tree1999a7e6d242198d48f0089c7995a50f339fa3e4 /drivers/acpi/Kconfig
parent530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff)
parente3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff)
downloadop-kernel-dev-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.zip
op-kernel-dev-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.tar.gz
Merge branch 'misc' into test
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r--drivers/acpi/Kconfig4
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
OpenPOWER on IntegriCloud