[media] rc: Add support for decoding XMP protocol

[mirror_ubuntu-artful-kernel.git] / drivers / media / rc / Kconfig

diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index 8fbd377e6311460d77e32a962c8724b30b31d656..5e626af8e3130b0a7fbed625c1f7b1101f696270 100644 (file)
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -84,18 +84,6 @@ config IR_SONY_DECODER
           Enable this option if you have an infrared remote control which
           uses the Sony protocol, and you need software decoding support.
 
-config IR_RC5_SZ_DECODER
-       tristate "Enable IR raw decoder for the RC-5 (streamzap) protocol"
-       depends on RC_CORE
-       select BITREVERSE
-       default y
-
-       ---help---
-          Enable this option if you have IR with RC-5 (streamzap) protocol,
-          and if the IR is decoded in software. (The Streamzap PC Remote
-          uses an IR protocol that is almost standard RC-5, but not quite,
-          as it uses an additional bit).
-
 config IR_SANYO_DECODER
        tristate "Enable IR raw decoder for the Sanyo protocol"
        depends on RC_CORE
@@ -125,6 +113,16 @@ config IR_MCE_KBD_DECODER
           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_XMP_DECODER
+       tristate "Enable IR raw decoder for the XMP protocol"
+       depends on RC_CORE
+       select BITREVERSE
+       default y
+
+       ---help---
+          Enable this option if you have IR with XMP protocol, and
+          if the IR is decoded in software
 endif #RC_DECODERS
 
 menuconfig RC_DEVICES
@@ -343,4 +341,14 @@ config RC_ST
 
         If you're not sure, select N here.
 
+config IR_SUNXI
+    tristate "SUNXI IR remote control"
+    depends on RC_CORE
+    depends on ARCH_SUNXI
+    ---help---
+      Say Y if you want to use sunXi internal IR Controller
+
+      To compile this driver as a module, choose M here: the module will
+      be called sunxi-ir.
+
 endif #RC_DEVICES