---

yaml --- r: 193006 b: refs/heads/master c: 21677cf h: refs/heads/master v: v3
git-mirror · May 19, 2010 · 734a807 · 734a807
1 parent 65c4661
commit 734a807
Show file tree

Hide file tree

Showing 4 changed files with 2,433 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1159f838c0a334855c05c7c94f7a20799c57442d
+refs/heads/master: 21677cfc562a27e099719d413287bc8d1d24deb7
diff --git a/trunk/drivers/media/IR/Kconfig b/trunk/drivers/media/IR/Kconfig
@@ -36,3 +36,15 @@ config IR_RC6_DECODER
 	---help---
 	   Enable this option if you have an infrared remote control which
 	   uses the RC6 protocol, and you need software decoding support.
+
+config IR_IMON
+	tristate "SoundGraph iMON Receiver and Display"
+	depends on USB_ARCH_HAS_HCD
+	depends on IR_CORE
+	select USB
+	---help---
+	   Say Y here if you want to use a SoundGraph iMON (aka Antec Veris)
+	   IR Receiver and/or LCD/VFD/VGA display.
+
+	   To compile this driver as a module, choose M here: the
+	   module will be called imon.
diff --git a/trunk/drivers/media/IR/Makefile b/trunk/drivers/media/IR/Makefile
@@ -8,3 +8,6 @@ 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
 obj-$(CONFIG_IR_RC6_DECODER) += ir-rc6-decoder.o
+
+# stand-alone IR receivers/transmitters
+obj-$(CONFIG_IR_IMON) += imon.o