Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / rc / keymaps / rc-rc6-mce.c

diff --git a/drivers/media/IR/keymaps/rc-rc6-mce.c b/drivers/media/rc/keymaps/rc-rc6-mce.c
similarity index 87%
rename from drivers/media/IR/keymaps/rc-rc6-mce.c
rename to drivers/media/rc/keymaps/rc-rc6-mce.c
index 6da955dfef48989a1773792f09bf1715326a86b5..2f5dc0622b94c57dbe0d8ba3e63d0da3b5f6d6c6 100644 (file)
--- a/drivers/media/IR/keymaps/rc-rc6-mce.c
+++ b/drivers/media/rc/keymaps/rc-rc6-mce.c
@@ -3,6 +3,9 @@
  *
  * Copyright (c) 2010 by Jarod Wilson <jarod@redhat.com>
  *
+ * See http://mediacenterguides.com/book/export/html/31 for details on
+ * key mappings.
+ *
  * 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
@@ -11,7 +14,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode rc6_mce[] = {
+static struct rc_map_table rc6_mce[] = {
 
        { 0x800f0400, KEY_NUMERIC_0 },
        { 0x800f0401, KEY_NUMERIC_1 },
@@ -60,6 +63,9 @@ static struct ir_scancode rc6_mce[] = {
        { 0x800f0426, KEY_EPG },                /* Guide */
        { 0x800f0427, KEY_ZOOM },               /* Aspect */
 
+       { 0x800f0432, KEY_MODE },               /* Visualization */
+       { 0x800f0433, KEY_PRESENTATION },       /* Slide Show */
+       { 0x800f0434, KEY_EJECTCD },
        { 0x800f043a, KEY_BRIGHTNESSUP },
 
        { 0x800f0446, KEY_TV },
@@ -87,23 +93,23 @@ static struct ir_scancode rc6_mce[] = {
        { 0x800f0481, KEY_PLAYPAUSE },
 };
 
-static struct rc_keymap rc6_mce_map = {
+static struct rc_map_list rc6_mce_map = {
        .map = {
                .scan    = rc6_mce,
                .size    = ARRAY_SIZE(rc6_mce),
-               .ir_type = IR_TYPE_RC6,
+               .rc_type = RC_TYPE_RC6,
                .name    = RC_MAP_RC6_MCE,
        }
 };
 
 static int __init init_rc_map_rc6_mce(void)
 {
-       return ir_register_map(&rc6_mce_map);
+       return rc_map_register(&rc6_mce_map);
 }
 
 static void __exit exit_rc_map_rc6_mce(void)
 {
-       ir_unregister_map(&rc6_mce_map);
+       rc_map_unregister(&rc6_mce_map);
 }
 
 module_init(init_rc_map_rc6_mce)