Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / media / rc / keymaps / rc-tevii-nec.c

diff --git a/drivers/media/IR/keymaps/rc-tevii-nec.c b/drivers/media/rc/keymaps/rc-tevii-nec.c
similarity index 89%
rename from drivers/media/IR/keymaps/rc-tevii-nec.c
rename to drivers/media/rc/keymaps/rc-tevii-nec.c
index e30d411c07bb2b94a63f3fb80029496d1a8709aa..ef5ba3f3273543a28d4c04d4c4755d870687e5cd 100644 (file)
--- a/drivers/media/IR/keymaps/rc-tevii-nec.c
+++ b/drivers/media/rc/keymaps/rc-tevii-nec.c
@@ -12,7 +12,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode tevii_nec[] = {
+static struct rc_map_table tevii_nec[] = {
        { 0x0a, KEY_POWER2},
        { 0x0c, KEY_MUTE},
        { 0x11, KEY_1},
@@ -62,23 +62,23 @@ static struct ir_scancode tevii_nec[] = {
        { 0x58, KEY_SWITCHVIDEOMODE},
 };
 
-static struct rc_keymap tevii_nec_map = {
+static struct rc_map_list tevii_nec_map = {
        .map = {
                .scan    = tevii_nec,
                .size    = ARRAY_SIZE(tevii_nec),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_TEVII_NEC,
        }
 };
 
 static int __init init_rc_map_tevii_nec(void)
 {
-       return ir_register_map(&tevii_nec_map);
+       return rc_map_register(&tevii_nec_map);
 }
 
 static void __exit exit_rc_map_tevii_nec(void)
 {
-       ir_unregister_map(&tevii_nec_map);
+       rc_map_unregister(&tevii_nec_map);
 }
 
 module_init(init_rc_map_tevii_nec)