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, 96 insertions, 0 deletions

diff --git a/drivers/media/rc/keymaps/rc-nebula.c b/drivers/media/rc/keymaps/rc-nebula.c
new file mode 100644
index 000000000000..3e6f077eb700
--- /dev/null
+++ b/drivers/media/rc/keymaps/rc-nebula.c
@@ -0,0 +1,96 @@
+/* nebula.h - Keytable for nebula 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>
+
+static struct rc_map_table nebula[] = {
+        { 0x00, KEY_0 },
+        { 0x01, KEY_1 },
+        { 0x02, KEY_2 },
+        { 0x03, KEY_3 },
+        { 0x04, KEY_4 },
+        { 0x05, KEY_5 },
+        { 0x06, KEY_6 },
+        { 0x07, KEY_7 },
+        { 0x08, KEY_8 },
+        { 0x09, KEY_9 },
+        { 0x0a, KEY_TV },
+        { 0x0b, KEY_AUX },
+        { 0x0c, KEY_DVD },
+        { 0x0d, KEY_POWER },
+        { 0x0e, KEY_MHP },      /* labelled 'Picture' */
+        { 0x0f, KEY_AUDIO },
+        { 0x10, KEY_INFO },
+        { 0x11, KEY_F13 },      /* 16:9 */
+        { 0x12, KEY_F14 },      /* 14:9 */
+        { 0x13, KEY_EPG },
+        { 0x14, KEY_EXIT },
+        { 0x15, KEY_MENU },
+        { 0x16, KEY_UP },
+        { 0x17, KEY_DOWN },
+        { 0x18, KEY_LEFT },
+        { 0x19, KEY_RIGHT },
+        { 0x1a, KEY_ENTER },
+        { 0x1b, KEY_CHANNELUP },
+        { 0x1c, KEY_CHANNELDOWN },
+        { 0x1d, KEY_VOLUMEUP },
+        { 0x1e, KEY_VOLUMEDOWN },
+        { 0x1f, KEY_RED },
+        { 0x20, KEY_GREEN },
+        { 0x21, KEY_YELLOW },
+        { 0x22, KEY_BLUE },
+        { 0x23, KEY_SUBTITLE },
+        { 0x24, KEY_F15 },      /* AD */
+        { 0x25, KEY_TEXT },
+        { 0x26, KEY_MUTE },
+        { 0x27, KEY_REWIND },
+        { 0x28, KEY_STOP },
+        { 0x29, KEY_PLAY },
+        { 0x2a, KEY_FASTFORWARD },
+        { 0x2b, KEY_F16 },      /* chapter */
+        { 0x2c, KEY_PAUSE },
+        { 0x2d, KEY_PLAY },
+        { 0x2e, KEY_RECORD },
+        { 0x2f, KEY_F17 },      /* picture in picture */
+        { 0x30, KEY_KPPLUS },   /* zoom in */
+        { 0x31, KEY_KPMINUS },  /* zoom out */
+        { 0x32, KEY_F18 },      /* capture */
+        { 0x33, KEY_F19 },      /* web */
+        { 0x34, KEY_EMAIL },
+        { 0x35, KEY_PHONE },
+        { 0x36, KEY_PC },
+};
+
+static struct rc_map_list nebula_map = {
+        .map = {
+                .scan    = nebula,
+                .size    = ARRAY_SIZE(nebula),
+                .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
+                .name    = RC_MAP_NEBULA,
+        }
+};
+
+static int __init init_rc_map_nebula(void)
+{
+        return rc_map_register(&nebula_map);
+}
+
+static void __exit exit_rc_map_nebula(void)
+{
+        rc_map_unregister(&nebula_map);
+}
+
+module_init(init_rc_map_nebula)
+module_exit(exit_rc_map_nebula)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");