---

yaml --- r: 254649 b: refs/heads/master c: 372b424 h: refs/heads/master i: 254647: ab08f85 v: v3
git-mirror · Jul 1, 2011 · 761e835 · 761e835
1 parent a3175b5
commit 761e835
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 842071c9ea021a42256386cb0cbe3735af33c4db
+refs/heads/master: 372b4249243d1e7c12a0f2b67e7badc608fcff45
diff --git a/trunk/drivers/media/rc/imon.c b/trunk/drivers/media/rc/imon.c
@@ -1767,6 +1767,9 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
 		dev_info(ictx->dev, "Unknown 0xffdc device, "
 			 "defaulting to VFD and iMON IR");
 		detected_display_type = IMON_DISPLAY_TYPE_VFD;
+		/* We don't know which one it is, allow user to set the
+		 * RC6 one from userspace if OTHER wasn't correct. */
+		allowed_protos |= RC_TYPE_RC6;
 		break;
 	}