Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block

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

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index cbe21bc..02f4f8f 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -222,6 +222,23 @@ config INPUT_SGI_BTNS
          To compile this driver as a module, choose M here: the
          module will be called sgi_btns.
 
+config INPUT_WINBOND_CIR
+       tristate "Winbond IR remote control"
+       depends on X86 && PNP
+       select NEW_LEDS
+       select LEDS_CLASS
+       select BITREVERSE
+       help
+         Say Y here if you want to use the IR remote functionality found
+         in some Winbond SuperI/O chips. Currently only the WPCD376I
+         chip is supported (included in some Intel Media series motherboards).
+
+         IR Receive and wake-on-IR from suspend and power-off is currently
+         supported.
+
+         To compile this driver as a module, choose M here: the module will be
+         called winbond_cir.
+
 config HP_SDC_RTC
        tristate "HP SDC Real Time Clock"
        depends on (GSC || HP300) && SERIO
@@ -279,4 +296,24 @@ config INPUT_BFIN_ROTARY
          To compile this driver as a module, choose M here: the
          module will be called bfin-rotary.
 
+config INPUT_WM831X_ON
+       tristate "WM831X ON pin"
+       depends on MFD_WM831X
+       help
+         Support the ON pin of WM831X PMICs as an input device
+         reporting power button status.
+
+         To compile this driver as a module, choose M here: the module
+         will be called wm831x_on.
+
+config INPUT_PCAP
+       tristate "Motorola EZX PCAP misc input events"
+       depends on EZX_PCAP
+       help
+         Say Y here if you want to use Power key and Headphone button
+         on Motorola EZX phones.
+
+         To compile this driver as a module, choose M here: the
+         module will be called pcap_keys.
+
 endif