Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  [media] v1.88 DM04/QQBOX Move remote to use rc_core dvb-usb-remote
  [media] Add missing include guard to header file
  [media] Inlined functions should be static
  [media] Remove invalid parameter description
  [media] cpia2: fix warning about invalid trigraph sequence
  [media] s5p-csis: Add missing dependency on PLAT_S5P
  [media] gspca/kinect: wrap gspca_debug with GSPCA_DEBUG
  [media] fintek-cir: new driver for Fintek LPC SuperIO CIR function
  [media] uvcvideo: Connect video devices to media entities
  [media] uvcvideo: Register subdevices for each entity
  [media] uvcvideo: Register a v4l2_device
  [media] add V4L2-PIX-FMT-SRGGB12 & friends to docbook
  [media] Documentation/DocBook: Rename media fops xml files
  [media] Media DocBook: fix validation errors
  [media] wl12xx: g_volatile_ctrl fix: wrong field set
  [media] fix kconfig dependency warning for VIDEO_TIMBERDALE
  [media] dm1105: GPIO handling added, I2C on GPIO added, LNB control through GPIO reworked
  [media] Add support for M-5MOLS 8 Mega Pixel camera ISP

1 files changed, 67 insertions, 67 deletions

diff --git a/drivers/media/rc/keymaps/rc-lme2510.c b/drivers/media/rc/keymaps/rc-lme2510.c
index afae14fd152e..129d3f9a461d 100644
--- a/drivers/media/rc/keymaps/rc-lme2510.c
+++ b/drivers/media/rc/keymaps/rc-lme2510.c
@@ -14,81 +14,81 @@
 
 static struct rc_map_table lme2510_rc[] = {
         /* Type 1 - 26 buttons */
-        { 0xef12ba45, KEY_0 },
-        { 0xef12a05f, KEY_1 },
-        { 0xef12af50, KEY_2 },
-        { 0xef12a25d, KEY_3 },
-        { 0xef12be41, KEY_4 },
-        { 0xef12f50a, KEY_5 },
-        { 0xef12bd42, KEY_6 },
-        { 0xef12b847, KEY_7 },
-        { 0xef12b649, KEY_8 },
-        { 0xef12fa05, KEY_9 },
-        { 0xef12bc43, KEY_POWER },
-        { 0xef12b946, KEY_SUBTITLE },
-        { 0xef12f906, KEY_PAUSE },
-        { 0xef12fc03, KEY_MEDIA_REPEAT},
-        { 0xef12fd02, KEY_PAUSE },
-        { 0xef12a15e, KEY_VOLUMEUP },
-        { 0xef12a35c, KEY_VOLUMEDOWN },
-        { 0xef12f609, KEY_CHANNELUP },
-        { 0xef12e51a, KEY_CHANNELDOWN },
-        { 0xef12e11e, KEY_PLAY },
-        { 0xef12e41b, KEY_ZOOM },
-        { 0xef12a659, KEY_MUTE },
-        { 0xef12a55a, KEY_TV },
-        { 0xef12e718, KEY_RECORD },
-        { 0xef12f807, KEY_EPG },
-        { 0xef12fe01, KEY_STOP },
+        { 0x10ed45, KEY_0 },
+        { 0x10ed5f, KEY_1 },
+        { 0x10ed50, KEY_2 },
+        { 0x10ed5d, KEY_3 },
+        { 0x10ed41, KEY_4 },
+        { 0x10ed0a, KEY_5 },
+        { 0x10ed42, KEY_6 },
+        { 0x10ed47, KEY_7 },
+        { 0x10ed49, KEY_8 },
+        { 0x10ed05, KEY_9 },
+        { 0x10ed43, KEY_POWER },
+        { 0x10ed46, KEY_SUBTITLE },
+        { 0x10ed06, KEY_PAUSE },
+        { 0x10ed03, KEY_MEDIA_REPEAT},
+        { 0x10ed02, KEY_PAUSE },
+        { 0x10ed5e, KEY_VOLUMEUP },
+        { 0x10ed5c, KEY_VOLUMEDOWN },
+        { 0x10ed09, KEY_CHANNELUP },
+        { 0x10ed1a, KEY_CHANNELDOWN },
+        { 0x10ed1e, KEY_PLAY },
+        { 0x10ed1b, KEY_ZOOM },
+        { 0x10ed59, KEY_MUTE },
+        { 0x10ed5a, KEY_TV },
+        { 0x10ed18, KEY_RECORD },
+        { 0x10ed07, KEY_EPG },
+        { 0x10ed01, KEY_STOP },
         /* Type 2 - 20 buttons */
-        { 0xff40ea15, KEY_0 },
-        { 0xff40f708, KEY_1 },
-        { 0xff40f609, KEY_2 },
-        { 0xff40f50a, KEY_3 },
-        { 0xff40f30c, KEY_4 },
-        { 0xff40f20d, KEY_5 },
-        { 0xff40f10e, KEY_6 },
-        { 0xff40ef10, KEY_7 },
-        { 0xff40ee11, KEY_8 },
-        { 0xff40ed12, KEY_9 },
-        { 0xff40ff00, KEY_POWER },
-        { 0xff40fb04, KEY_MEDIA_REPEAT}, /* Recall */
-        { 0xff40e51a, KEY_PAUSE }, /* Timeshift */
-        { 0xff40fd02, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */
-        { 0xff40f906, KEY_VOLUMEDOWN }, /* Volume defined as right hand*/
-        { 0xff40fe01, KEY_CHANNELUP },
-        { 0xff40fa05, KEY_CHANNELDOWN },
-        { 0xff40eb14, KEY_ZOOM },
-        { 0xff40e718, KEY_RECORD },
-        { 0xff40e916, KEY_STOP },
+        { 0xbf15, KEY_0 },
+        { 0xbf08, KEY_1 },
+        { 0xbf09, KEY_2 },
+        { 0xbf0a, KEY_3 },
+        { 0xbf0c, KEY_4 },
+        { 0xbf0d, KEY_5 },
+        { 0xbf0e, KEY_6 },
+        { 0xbf10, KEY_7 },
+        { 0xbf11, KEY_8 },
+        { 0xbf12, KEY_9 },
+        { 0xbf00, KEY_POWER },
+        { 0xbf04, KEY_MEDIA_REPEAT}, /* Recall */
+        { 0xbf1a, KEY_PAUSE }, /* Timeshift */
+        { 0xbf02, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */
+        { 0xbf06, KEY_VOLUMEDOWN }, /* Volume defined as right hand*/
+        { 0xbf01, KEY_CHANNELUP },
+        { 0xbf05, KEY_CHANNELDOWN },
+        { 0xbf14, KEY_ZOOM },
+        { 0xbf18, KEY_RECORD },
+        { 0xbf16, KEY_STOP },
         /* Type 3 - 20 buttons */
-        { 0xff00e31c, KEY_0 },
-        { 0xff00f807, KEY_1 },
-        { 0xff00ea15, KEY_2 },
-        { 0xff00f609, KEY_3 },
-        { 0xff00e916, KEY_4 },
-        { 0xff00e619, KEY_5 },
-        { 0xff00f20d, KEY_6 },
-        { 0xff00f30c, KEY_7 },
-        { 0xff00e718, KEY_8 },
-        { 0xff00a15e, KEY_9 },
-        { 0xff00ba45, KEY_POWER },
-        { 0xff00bb44, KEY_MEDIA_REPEAT}, /* Recall */
-        { 0xff00b54a, KEY_PAUSE }, /* Timeshift */
-        { 0xff00b847, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */
-        { 0xff00bc43, KEY_VOLUMEDOWN }, /* Volume defined as right hand*/
-        { 0xff00b946, KEY_CHANNELUP },
-        { 0xff00bf40, KEY_CHANNELDOWN },
-        { 0xff00f708, KEY_ZOOM },
-        { 0xff00bd42, KEY_RECORD },
-        { 0xff00a55a, KEY_STOP },
+        { 0x1c, KEY_0 },
+        { 0x07, KEY_1 },
+        { 0x15, KEY_2 },
+        { 0x09, KEY_3 },
+        { 0x16, KEY_4 },
+        { 0x19, KEY_5 },
+        { 0x0d, KEY_6 },
+        { 0x0c, KEY_7 },
+        { 0x18, KEY_8 },
+        { 0x5e, KEY_9 },
+        { 0x45, KEY_POWER },
+        { 0x44, KEY_MEDIA_REPEAT}, /* Recall */
+        { 0x4a, KEY_PAUSE }, /* Timeshift */
+        { 0x47, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */
+        { 0x43, KEY_VOLUMEDOWN }, /* Volume defined as right hand*/
+        { 0x46, KEY_CHANNELUP },
+        { 0x40, KEY_CHANNELDOWN },
+        { 0x08, KEY_ZOOM },
+        { 0x42, KEY_RECORD },
+        { 0x5a, KEY_STOP },
 };
 
 static struct rc_map_list lme2510_map = {
         .map = {
                 .scan    = lme2510_rc,
                 .size    = ARRAY_SIZE(lme2510_rc),
-                .rc_type = RC_TYPE_UNKNOWN,
+                .rc_type = RC_TYPE_NEC,
                 .name    = RC_MAP_LME2510,
         }
 };