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-manli.c

diff --git a/drivers/media/IR/keymaps/rc-manli.c b/drivers/media/rc/keymaps/rc-manli.c
similarity index 94%
rename from drivers/media/IR/keymaps/rc-manli.c
rename to drivers/media/rc/keymaps/rc-manli.c
index 0f590b3d01c0b23091dc3b4c6c8c6155ceaa526e..23b2d04e7a9fde4ae0904fd83759ad85b2f6a4ab 100644 (file)
--- a/drivers/media/IR/keymaps/rc-manli.c
+++ b/drivers/media/rc/keymaps/rc-manli.c
@@ -21,7 +21,7 @@
    helps to descide which keycodes to assign to the buttons.
  */
 
-static struct ir_scancode manli[] = {
+static struct rc_map_table manli[] = {
 
        /*  0x1c            0x12  *
         * FUNCTION         POWER *
@@ -108,23 +108,23 @@ static struct ir_scancode manli[] = {
        /* 0x1d unused ? */
 };
 
-static struct rc_keymap manli_map = {
+static struct rc_map_list manli_map = {
        .map = {
                .scan    = manli,
                .size    = ARRAY_SIZE(manli),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_MANLI,
        }
 };
 
 static int __init init_rc_map_manli(void)
 {
-       return ir_register_map(&manli_map);
+       return rc_map_register(&manli_map);
 }
 
 static void __exit exit_rc_map_manli(void)
 {
-       ir_unregister_map(&manli_map);
+       rc_map_unregister(&manli_map);
 }
 
 module_init(init_rc_map_manli)