From 5fe8a2036f2f081d63c0e795c240d18dbf49cab1 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Sat, 4 Jun 2011 14:00:54 -0300
Subject: [PATCH] --- yaml --- r: 254614 b: refs/heads/master c:
 443b391900469f2c5ec5a354ce305000096a94b7 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/media/rc/imon.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7b25ff5b4f05..4865df34179c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b43fcdff6495958c39e3575848edef4b685ddef
+refs/heads/master: 443b391900469f2c5ec5a354ce305000096a94b7
diff --git a/trunk/drivers/media/rc/imon.c b/trunk/drivers/media/rc/imon.c
index 3f3c70716268..43344fd67130 100644
--- a/trunk/drivers/media/rc/imon.c
+++ b/trunk/drivers/media/rc/imon.c
@@ -307,6 +307,14 @@ static const struct {
 	/* 0xffdc iMON MCE VFD */
 	{ 0x00010000ffffffeell, KEY_VOLUMEUP },
 	{ 0x01000000ffffffeell, KEY_VOLUMEDOWN },
+	{ 0x00000001ffffffeell, KEY_MUTE },
+	{ 0x0000000fffffffeell, KEY_MEDIA },
+	{ 0x00000012ffffffeell, KEY_UP },
+	{ 0x00000013ffffffeell, KEY_DOWN },
+	{ 0x00000014ffffffeell, KEY_LEFT },
+	{ 0x00000015ffffffeell, KEY_RIGHT },
+	{ 0x00000016ffffffeell, KEY_ENTER },
+	{ 0x00000017ffffffeell, KEY_ESC },
 	/* iMON Knob values */
 	{ 0x000100ffffffffeell, KEY_VOLUMEUP },
 	{ 0x010000ffffffffeell, KEY_VOLUMEDOWN },
@@ -1740,6 +1748,7 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
 		detected_display_type = IMON_DISPLAY_TYPE_VFD;
 		break;
 	/* iMON VFD, MCE IR */
+	case 0x46:
 	case 0x9e:
 		dev_info(ictx->dev, "0xffdc iMON VFD, MCE IR");
 		detected_display_type = IMON_DISPLAY_TYPE_VFD;