net: Fix typo in net/core/sock.c.

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

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 8f5c7b90187de92b11a3ca005d04c532d934048d..92b683411d5ab293cf27d34c0a9c07e1fafa2cf5 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -15,6 +15,7 @@ if INPUT_MISC
 config INPUT_PCSPKR
        tristate "PC Speaker support"
        depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+       depends on SND_PCSP=n
        help
          Say Y here if you want the standard PC Speaker to be used for
          bells and whistles.
@@ -40,6 +41,20 @@ config INPUT_M68K_BEEP
        tristate "M68k Beeper support"
        depends on M68K
 
+config INPUT_APANEL
+       tristate "Fujitsu Lifebook Application Panel buttons"
+       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,
+        which you should also build for this kernel.
+
+        To compile this driver as a module, choose M here: the module will
+        be called apanel.
+
 config INPUT_IXP4XX_BEEPER
        tristate "IXP4XX Beeper support"
        depends on ARCH_IXP4XX