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: (255 commits)
  [media] radio-aimslab.c: Fix gcc 4.5+ bug
  [media] cx25821: Fix compilation breakage due to BKL dependency
  [media] v4l2-compat-ioctl32: fix compile warning
  [media] zoran: fix compiler warning
  [media] tda18218: fix compile warning
  [media] ngene: fix compile warning
  [media] DVB: IR support for TechnoTrend CT-3650
  [media] cx23885, cimax2.c: Fix case of two CAM insertion irq
  [media] ir-nec-decoder: fix repeat key issue
  [media] staging: se401 depends on USB
  [media] staging: usbvideo/vicam depends on USB
  [media] soc_camera: Add the ability to bind regulators to soc_camedra devices
  [media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor
  [media] v4l: soc-camera: switch to .unlocked_ioctl
  [media] v4l: ov772x: simplify pointer dereference
  [media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving
  [media] ov9640: use macro to request OmniVision OV9640 sensor private data
  [media] ivtv-i2c: Fix two warnings
  [media] staging/lirc: Update lirc TODO files
  [media] cx88: Remove the obsolete i2c_adapter.id field
  ...

1 files changed, 81 insertions, 0 deletions

diff --git a/drivers/media/rc/keymaps/rc-gadmei-rm008z.c b/drivers/media/rc/keymaps/rc-gadmei-rm008z.c
new file mode 100644
index 000000000000..068c9ead98dd
--- /dev/null
+++ b/drivers/media/rc/keymaps/rc-gadmei-rm008z.c
@@ -0,0 +1,81 @@
+/* gadmei-rm008z.h - Keytable for gadmei_rm008z Remote Controller
+ *
+ * keymap imported from ir-keymaps.c
+ *
+ * Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <media/rc-map.h>
+
+/* GADMEI UTV330+ RM008Z remote
+   Shine Liu <shinel@foxmail.com>
+ */
+
+static struct rc_map_table gadmei_rm008z[] = {
+        { 0x14, KEY_POWER2},            /* POWER OFF */
+        { 0x0c, KEY_MUTE},              /* MUTE */
+
+        { 0x18, KEY_TV},                /* TV */
+        { 0x0e, KEY_VIDEO},             /* AV */
+        { 0x0b, KEY_AUDIO},             /* SV */
+        { 0x0f, KEY_RADIO},             /* FM */
+
+        { 0x00, KEY_1},
+        { 0x01, KEY_2},
+        { 0x02, KEY_3},
+        { 0x03, KEY_4},
+        { 0x04, KEY_5},
+        { 0x05, KEY_6},
+        { 0x06, KEY_7},
+        { 0x07, KEY_8},
+        { 0x08, KEY_9},
+        { 0x09, KEY_0},
+        { 0x0a, KEY_INFO},              /* OSD */
+        { 0x1c, KEY_BACKSPACE},         /* LAST */
+
+        { 0x0d, KEY_PLAY},              /* PLAY */
+        { 0x1e, KEY_CAMERA},            /* SNAPSHOT */
+        { 0x1a, KEY_RECORD},            /* RECORD */
+        { 0x17, KEY_STOP},              /* STOP */
+
+        { 0x1f, KEY_UP},                /* UP */
+        { 0x44, KEY_DOWN},              /* DOWN */
+        { 0x46, KEY_TAB},               /* BACK */
+        { 0x4a, KEY_ZOOM},              /* FULLSECREEN */
+
+        { 0x10, KEY_VOLUMEUP},          /* VOLUMEUP */
+        { 0x11, KEY_VOLUMEDOWN},        /* VOLUMEDOWN */
+        { 0x12, KEY_CHANNELUP},         /* CHANNELUP */
+        { 0x13, KEY_CHANNELDOWN},       /* CHANNELDOWN */
+        { 0x15, KEY_ENTER},             /* OK */
+};
+
+static struct rc_map_list gadmei_rm008z_map = {
+        .map = {
+                .scan    = gadmei_rm008z,
+                .size    = ARRAY_SIZE(gadmei_rm008z),
+                .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
+                .name    = RC_MAP_GADMEI_RM008Z,
+        }
+};
+
+static int __init init_rc_map_gadmei_rm008z(void)
+{
+        return rc_map_register(&gadmei_rm008z_map);
+}
+
+static void __exit exit_rc_map_gadmei_rm008z(void)
+{
+        rc_map_unregister(&gadmei_rm008z_map);
+}
+
+module_init(init_rc_map_gadmei_rm008z)
+module_exit(exit_rc_map_gadmei_rm008z)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");