Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6] / drivers / input / misc / Kconfig

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 8b10d9f23bef29c7fd3acb8c3cd56566447ee96f..432699d61c58ed3e8b39d4d5d250b045a972abc4 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -14,7 +14,7 @@ if INPUT_MISC
 
 config INPUT_PCSPKR
        tristate "PC Speaker support"
-       depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+       depends on PCSPKR_PLATFORM
        help
          Say Y here if you want the standard PC Speaker to be used for
          bells and whistles.
@@ -42,14 +42,14 @@ config INPUT_M68K_BEEP
 
 config INPUT_APANEL
        tristate "Fujitsu Lifebook Application Panel buttons"
-       depends on X86
-       select I2C_I801
+       depends on X86 && I2C && LEDS_CLASS
        select INPUT_POLLDEV
        select CHECK_SIGNATURE
        help
         Say Y here for support of the Application Panel buttons, used on
         Fujitsu Lifebook. These are attached to the mainboard through
-        an SMBus interface managed by the I2C Intel ICH (i801) driver.
+        an SMBus interface managed by the I2C Intel ICH (i801) driver,
+        which you should also build for this kernel.
 
         To compile this driver as a module, choose M here: the module will
         be called apanel.