From ffc6a52cc42e5c749343b19e58fcacf78752f713 Mon Sep 17 00:00:00 2001
From: Franklin Meng <fmeng2002@yahoo.com>
Date: Thu, 11 Feb 2010 02:50:56 -0300
Subject: [PATCH] --- yaml --- r: 181674 b: refs/heads/master c:
 433763faec55e5f0e3aeb084da504c566134a934 h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/IR/ir-keymaps.c | 51 +++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 126cccb8d3d8..7b867e84ebbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96dd6de3d058a454a5bc4ce2f561a053dd90bfae
+refs/heads/master: 433763faec55e5f0e3aeb084da504c566134a934
diff --git a/trunk/drivers/media/IR/ir-keymaps.c b/trunk/drivers/media/IR/ir-keymaps.c
index 71b3278f67e5..0efdefe75f32 100644
--- a/trunk/drivers/media/IR/ir-keymaps.c
+++ b/trunk/drivers/media/IR/ir-keymaps.c
@@ -3441,3 +3441,54 @@ struct ir_scancode_table ir_codes_winfast_usbii_deluxe_table = {
 	.size = ARRAY_SIZE(ir_codes_winfast_usbii_deluxe),
 };
 EXPORT_SYMBOL_GPL(ir_codes_winfast_usbii_deluxe_table);
+
+/* Kworld 315U
+ */
+static struct ir_scancode ir_codes_kworld_315u[] = {
+	{ 0x6143, KEY_POWER },
+	{ 0x6101, KEY_TUNER },		/* source */
+	{ 0x610b, KEY_ZOOM },
+	{ 0x6103, KEY_POWER2 },		/* shutdown */
+
+	{ 0x6104, KEY_1 },
+	{ 0x6108, KEY_2 },
+	{ 0x6102, KEY_3 },
+	{ 0x6109, KEY_CHANNELUP },
+
+	{ 0x610f, KEY_4 },
+	{ 0x6105, KEY_5 },
+	{ 0x6106, KEY_6 },
+	{ 0x6107, KEY_CHANNELDOWN },
+
+	{ 0x610c, KEY_7 },
+	{ 0x610d, KEY_8 },
+	{ 0x610a, KEY_9 },
+	{ 0x610e, KEY_VOLUMEUP },
+
+	{ 0x6110, KEY_LAST },
+	{ 0x6111, KEY_0 },
+	{ 0x6112, KEY_ENTER },
+	{ 0x6113, KEY_VOLUMEDOWN },
+
+	{ 0x6114, KEY_RECORD },
+	{ 0x6115, KEY_STOP },
+	{ 0x6116, KEY_PLAY },
+	{ 0x6117, KEY_MUTE },
+
+	{ 0x6118, KEY_UP },
+	{ 0x6119, KEY_DOWN },
+	{ 0x611a, KEY_LEFT },
+	{ 0x611b, KEY_RIGHT },
+
+	{ 0x611c, KEY_RED },
+	{ 0x611d, KEY_GREEN },
+	{ 0x611e, KEY_YELLOW },
+	{ 0x611f, KEY_BLUE },
+};
+
+struct ir_scancode_table ir_codes_kworld_315u_table = {
+	.scan = ir_codes_kworld_315u,
+	.size = ARRAY_SIZE(ir_codes_kworld_315u),
+	.ir_type = IR_TYPE_NEC,
+};
+EXPORT_SYMBOL_GPL(ir_codes_kworld_315u_table);