Merge branch 'upstream-fixes'

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

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index b3eaac1b35b64109b27c475a8b4b818ce35be780..4bad588d0e5d6c53499aff9dbdb65dfc390aed35 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -26,7 +26,7 @@ config INPUT_PCSPKR
 
 config INPUT_SPARCSPKR
        tristate "SPARC Speaker support"
-       depends on PCI && (SPARC32 || SPARC64)
+       depends on PCI && SPARC
        help
          Say Y here if you want the standard Speaker on Sparc PCI systems
          to be used for bells and whistles.
@@ -40,6 +40,28 @@ config INPUT_M68K_BEEP
        tristate "M68k Beeper support"
        depends on M68K
 
+config INPUT_WISTRON_BTNS
+       tristate "x86 Wistron laptop button interface"
+       depends on X86 && !X86_64
+       help
+         Say Y here for support of Winstron laptop button interface, used on
+         laptops of various brands, including Acer and Fujitsu-Siemens.
+
+         To compile this driver as a module, choose M here: the module will
+         be called wistron_btns.
+
+config INPUT_IXP4XX_BEEPER
+       tristate "IXP4XX Beeper support"
+       depends on ARCH_IXP4XX
+       help
+         If you say yes here, you can connect a beeper to the
+         ixp4xx gpio pins. This is used by the LinkSys NSLU2.
+
+         If unsure, say Y.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ixp4xx-beeper.
+
 config INPUT_UINPUT
        tristate "User level driver support"
        help