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: (505 commits)
  [media] af9015: Fix max I2C message size when used with tda18271
  [media] IR: initialize ir_raw_event in few more drivers
  [media] Guard a divide in v4l1 compat layer
  [media] imon: fix nomouse modprobe option
  [media] imon: remove redundant change_protocol call
  [media] imon: fix my egregious brown paper bag w/rdev/idev split
  [media] cafe_ccic: Configure ov7670 correctly
  [media] ov7670: allow configuration of image size, clock speed, and I/O method
  [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016]
  [media] af9015: map DigitalNow TinyTwin v2 remote
  [media] DigitalNow TinyTwin remote controller
  [media] af9015: RC fixes and improvements
  videodev2.h.xml: Update to reflect the latest changes at videodev2.h
  [media] v4l: document new Bayer and monochrome pixel formats
  [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028
  [media] firedtv: add parameter to fake ca_system_ids in CA_INFO
  [media] tm6000: fix a macro coding style issue
  tm6000: Remove some ugly debug code
  [media] Nova-S-Plus audio line input
  [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers
  ...

1 files changed, 80 insertions, 0 deletions

diff --git a/drivers/media/IR/keymaps/rc-trekstor.c b/drivers/media/IR/keymaps/rc-trekstor.c
new file mode 100644
index 000000000000..91092caca452
--- /dev/null
+++ b/drivers/media/IR/keymaps/rc-trekstor.c
@@ -0,0 +1,80 @@
+/*
+ * TrekStor remote controller keytable
+ *
+ * Copyright (C) 2010 Antti Palosaari <crope@iki.fi>
+ *
+ *    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.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License along
+ *    with this program; if not, write to the Free Software Foundation, Inc.,
+ *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <media/rc-map.h>
+
+/* TrekStor DVB-T USB Stick remote controller. */
+/* Imported from af9015.h.
+   Initial keytable was from Marc Schneider <macke@macke.org> */
+static struct ir_scancode trekstor[] = {
+        { 0x0084, KEY_0 },
+        { 0x0085, KEY_MUTE },            /* Mute */
+        { 0x0086, KEY_HOMEPAGE },        /* Home */
+        { 0x0087, KEY_UP },              /* Up */
+        { 0x0088, KEY_OK },              /* OK */
+        { 0x0089, KEY_RIGHT },           /* Right */
+        { 0x008a, KEY_FASTFORWARD },     /* Fast forward */
+        { 0x008b, KEY_VOLUMEUP },        /* Volume + */
+        { 0x008c, KEY_DOWN },            /* Down */
+        { 0x008d, KEY_PLAY },            /* Play/Pause */
+        { 0x008e, KEY_STOP },            /* Stop */
+        { 0x008f, KEY_EPG },             /* Info/EPG */
+        { 0x0090, KEY_7 },
+        { 0x0091, KEY_4 },
+        { 0x0092, KEY_1 },
+        { 0x0093, KEY_CHANNELDOWN },     /* Channel - */
+        { 0x0094, KEY_8 },
+        { 0x0095, KEY_5 },
+        { 0x0096, KEY_2 },
+        { 0x0097, KEY_CHANNELUP },       /* Channel + */
+        { 0x0098, KEY_9 },
+        { 0x0099, KEY_6 },
+        { 0x009a, KEY_3 },
+        { 0x009b, KEY_VOLUMEDOWN },      /* Volume - */
+        { 0x009c, KEY_TV },              /* TV */
+        { 0x009d, KEY_RECORD },          /* Record */
+        { 0x009e, KEY_REWIND },          /* Rewind */
+        { 0x009f, KEY_LEFT },            /* Left */
+};
+
+static struct rc_keymap trekstor_map = {
+        .map = {
+                .scan    = trekstor,
+                .size    = ARRAY_SIZE(trekstor),
+                .ir_type = IR_TYPE_NEC,
+                .name    = RC_MAP_TREKSTOR,
+        }
+};
+
+static int __init init_rc_map_trekstor(void)
+{
+        return ir_register_map(&trekstor_map);
+}
+
+static void __exit exit_rc_map_trekstor(void)
+{
+        ir_unregister_map(&trekstor_map);
+}
+
+module_init(init_rc_map_trekstor)
+module_exit(exit_rc_map_trekstor)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");