---

yaml --- r: 192931 b: refs/heads/master c: db1423a h: refs/heads/master i: 192929: b3d9743 192927: 910c61f v: v3
git-mirror · May 19, 2010 · 3c482ff · 3c482ff
1 parent 9315d29
commit 3c482ff
Show file tree

Hide file tree

Showing 6 changed files with 390 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67780d6a2347d03b640f22295f8df7f00fbc829f
+refs/heads/master: db1423a6c79f66db2b1846614c13bde9c2db7ad2
diff --git a/trunk/drivers/media/IR/Kconfig b/trunk/drivers/media/IR/Kconfig
@@ -18,3 +18,12 @@ config IR_NEC_DECODER
 	---help---
 	   Enable this option if you have IR with NEC protocol, and
 	   if the IR is decoded in software
+
+config IR_RC5_DECODER
+	tristate "Enable IR raw decoder for RC-5 protocol"
+	depends on IR_CORE
+	default y
+
+	---help---
+	   Enable this option if you have IR with RC-5 protocol, and
+	   if the IR is decoded in software
diff --git a/trunk/drivers/media/IR/Makefile b/trunk/drivers/media/IR/Makefile
@@ -6,3 +6,4 @@ obj-y += keymaps/
 obj-$(CONFIG_IR_CORE) += ir-core.o
 obj-$(CONFIG_VIDEO_IR) += ir-common.o
 obj-$(CONFIG_IR_NEC_DECODER) += ir-nec-decoder.o
+obj-$(CONFIG_IR_RC5_DECODER) += ir-rc5-decoder.o
diff --git a/trunk/drivers/media/IR/ir-raw-event.c b/trunk/drivers/media/IR/ir-raw-event.c
@@ -200,6 +200,7 @@ static void init_decoders(struct work_struct *work)
 	/* Load the decoder modules */
 
 	load_nec_decode();
+	load_rc5_decode();
 
 	/* If needed, we may later add some init code. In this case,
 	   it is needed to change the CONFIG_MODULE test at ir-core.h