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

[pandora-kernel.git] / drivers / input / misc / Kconfig

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index e08dbe0..41b4258 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 && SPARC
+       depends on PCI && SPARC64
        help
          Say Y here if you want the standard Speaker on Sparc PCI systems
          to be used for bells and whistles.
@@ -50,6 +50,28 @@ config INPUT_WISTRON_BTNS
          To compile this driver as a module, choose M here: the module will
          be called wistron_btns.
 
+config INPUT_ATLAS_BTNS
+       tristate "x86 Atlas button interface"
+       depends on X86 && ACPI
+       help
+         Say Y here for support of Atlas wallmount touchscreen buttons.
+         The events will show up as scancodes F1 through F9 via evdev.
+
+         To compile this driver as a module, choose M here: the module will
+         be called atlas_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
@@ -61,7 +83,7 @@ config INPUT_UINPUT
 
 config HP_SDC_RTC
        tristate "HP SDC Real Time Clock"       
-       depends on GSC
+       depends on GSC || HP300
        select HP_SDC
        help
          Say Y here if you want to support the built-in real time clock