diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:38 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:38 -0400 |
| commit | 5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (patch) | |
| tree | 1999a7e6d242198d48f0089c7995a50f339fa3e4 /drivers/acpi/Kconfig | |
| parent | 530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff) | |
| parent | e3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff) | |
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 3919d6dbe06f..cbfc58d60236 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
| @@ -42,7 +42,7 @@ if ACPI | |||
| 42 | 42 | ||
| 43 | config ACPI_SLEEP | 43 | config ACPI_SLEEP |
| 44 | bool | 44 | bool |
| 45 | depends on PM_SLEEP | 45 | depends on SUSPEND || HIBERNATION |
| 46 | default y | 46 | default y |
| 47 | 47 | ||
| 48 | config ACPI_PROCFS | 48 | config ACPI_PROCFS |
| @@ -252,7 +252,7 @@ config ACPI_ASUS | |||
| 252 | 252 | ||
| 253 | config ACPI_TOSHIBA | 253 | config ACPI_TOSHIBA |
| 254 | tristate "Toshiba Laptop Extras" | 254 | tristate "Toshiba Laptop Extras" |
| 255 | depends on X86 | 255 | depends on X86 && INPUT |
| 256 | select BACKLIGHT_CLASS_DEVICE | 256 | select BACKLIGHT_CLASS_DEVICE |
| 257 | ---help--- | 257 | ---help--- |
| 258 | This driver adds support for access to certain system settings | 258 | This driver adds support for access to certain system settings |