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-fusionhdtv-mce.c

diff --git a/drivers/media/IR/keymaps/rc-fusionhdtv-mce.c b/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c
similarity index 90%
rename from drivers/media/IR/keymaps/rc-fusionhdtv-mce.c
rename to drivers/media/rc/keymaps/rc-fusionhdtv-mce.c
index cdb10389b10ef5cbfe42c434dc6bc7896d52e5f6..c80b25c65b57fe7286a5c9c689fb00b085cde507 100644 (file)
--- a/drivers/media/IR/keymaps/rc-fusionhdtv-mce.c
+++ b/drivers/media/rc/keymaps/rc-fusionhdtv-mce.c
@@ -14,7 +14,7 @@
 
 /* DViCO FUSION HDTV MCE remote */
 
-static struct ir_scancode fusionhdtv_mce[] = {
+static struct rc_map_table fusionhdtv_mce[] = {
 
        { 0x0b, KEY_1 },
        { 0x17, KEY_2 },
@@ -72,23 +72,23 @@ static struct ir_scancode fusionhdtv_mce[] = {
        { 0x4e, KEY_POWER },
 };
 
-static struct rc_keymap fusionhdtv_mce_map = {
+static struct rc_map_list fusionhdtv_mce_map = {
        .map = {
                .scan    = fusionhdtv_mce,
                .size    = ARRAY_SIZE(fusionhdtv_mce),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_FUSIONHDTV_MCE,
        }
 };
 
 static int __init init_rc_map_fusionhdtv_mce(void)
 {
-       return ir_register_map(&fusionhdtv_mce_map);
+       return rc_map_register(&fusionhdtv_mce_map);
 }
 
 static void __exit exit_rc_map_fusionhdtv_mce(void)
 {
-       ir_unregister_map(&fusionhdtv_mce_map);
+       rc_map_unregister(&fusionhdtv_mce_map);
 }
 
 module_init(init_rc_map_fusionhdtv_mce)