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

diff --git a/drivers/media/rc/keymaps/rc-streamzap.c b/drivers/media/rc/keymaps/rc-streamzap.c
new file mode 100644
index 000000000000..92cc10d2f9cd
--- /dev/null
+++ b/drivers/media/rc/keymaps/rc-streamzap.c
@@ -0,0 +1,82 @@
+/* rc-streamzap.c - Keytable for Streamzap PC Remote, for use
+ * with the Streamzap PC Remote IR Receiver.
+ *
+ * Copyright (c) 2010 by Jarod Wilson <jarod@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 streamzap[] = {
+/*
+ * The Streamzap remote is almost, but not quite, RC-5, as it has an extra
+ * bit in it, which throws the in-kernel RC-5 decoder for a loop. Currently,
+ * an additional RC-5-sz decoder is being deployed to support it, but it
+ * may be possible to merge it back with the standard RC-5 decoder.
+ */
+        { 0x28c0, KEY_NUMERIC_0 },
+        { 0x28c1, KEY_NUMERIC_1 },
+        { 0x28c2, KEY_NUMERIC_2 },
+        { 0x28c3, KEY_NUMERIC_3 },
+        { 0x28c4, KEY_NUMERIC_4 },
+        { 0x28c5, KEY_NUMERIC_5 },
+        { 0x28c6, KEY_NUMERIC_6 },
+        { 0x28c7, KEY_NUMERIC_7 },
+        { 0x28c8, KEY_NUMERIC_8 },
+        { 0x28c9, KEY_NUMERIC_9 },
+        { 0x28ca, KEY_POWER },
+        { 0x28cb, KEY_MUTE },
+        { 0x28cc, KEY_CHANNELUP },
+        { 0x28cd, KEY_VOLUMEUP },
+        { 0x28ce, KEY_CHANNELDOWN },
+        { 0x28cf, KEY_VOLUMEDOWN },
+        { 0x28d0, KEY_UP },
+        { 0x28d1, KEY_LEFT },
+        { 0x28d2, KEY_OK },
+        { 0x28d3, KEY_RIGHT },
+        { 0x28d4, KEY_DOWN },
+        { 0x28d5, KEY_MENU },
+        { 0x28d6, KEY_EXIT },
+        { 0x28d7, KEY_PLAY },
+        { 0x28d8, KEY_PAUSE },
+        { 0x28d9, KEY_STOP },
+        { 0x28da, KEY_BACK },
+        { 0x28db, KEY_FORWARD },
+        { 0x28dc, KEY_RECORD },
+        { 0x28dd, KEY_REWIND },
+        { 0x28de, KEY_FASTFORWARD },
+        { 0x28e0, KEY_RED },
+        { 0x28e1, KEY_GREEN },
+        { 0x28e2, KEY_YELLOW },
+        { 0x28e3, KEY_BLUE },
+
+};
+
+static struct rc_map_list streamzap_map = {
+        .map = {
+                .scan    = streamzap,
+                .size    = ARRAY_SIZE(streamzap),
+                .rc_type = RC_TYPE_RC5_SZ,
+                .name    = RC_MAP_STREAMZAP,
+        }
+};
+
+static int __init init_rc_map_streamzap(void)
+{
+        return rc_map_register(&streamzap_map);
+}
+
+static void __exit exit_rc_map_streamzap(void)
+{
+        rc_map_unregister(&streamzap_map);
+}
+
+module_init(init_rc_map_streamzap)
+module_exit(exit_rc_map_streamzap)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Jarod Wilson <jarod@redhat.com>");