Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[pandora-kernel.git] / drivers / media / rc / Kconfig

diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index 7d4bbc2..899f783 100644 (file)
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -87,6 +87,17 @@ config IR_RC5_SZ_DECODER
           uses an IR protocol that is almost standard RC-5, but not quite,
           as it uses an additional bit).
 
+config IR_MCE_KBD_DECODER
+       tristate "Enable IR raw decoder for the MCE keyboard/mouse protocol"
+       depends on RC_CORE
+       select BITREVERSE
+       default y
+
+       ---help---
+          Enable this option if you have a Microsoft Remote Keyboard for
+          Windows Media Center Edition, which you would like to use with
+          a raw IR receiver in your system.
+
 config IR_LIRC_CODEC
        tristate "Enable IR to LIRC bridge"
        depends on RC_CORE