ACPI suspend: Fix CONFIG_ACPI_SLEEP dependence and some compilation warnings

[linux-2.6-omap-h63xx.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 735f5ea17473152fc9560a49f15de97cb1dd71b4..325b4b5fa7dfa53e505439d3ea85e7fd6adcb6dc 100644 (file)
--- 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
@@ -259,7 +259,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