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-dib0700-rc5.c

diff --git a/drivers/media/IR/keymaps/rc-dib0700-rc5.c b/drivers/media/rc/keymaps/rc-dib0700-rc5.c
similarity index 96%
rename from drivers/media/IR/keymaps/rc-dib0700-rc5.c
rename to drivers/media/rc/keymaps/rc-dib0700-rc5.c
index 4a4797cfd77d7a66f64114f7a61e8539296ed23b..4af12e45dfbaaaacde6b1906cff036ca8da6027f 100644 (file)
--- a/drivers/media/IR/keymaps/rc-dib0700-rc5.c
+++ b/drivers/media/rc/keymaps/rc-dib0700-rc5.c
@@ -17,7 +17,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode dib0700_rc5_table[] = {
+static struct rc_map_table dib0700_rc5_table[] = {
        /* Key codes for the tiny Pinnacle remote*/
        { 0x0700, KEY_MUTE },
        { 0x0701, KEY_MENU }, /* Pinnacle logo */
@@ -209,23 +209,23 @@ static struct ir_scancode dib0700_rc5_table[] = {
        { 0x1d3d, KEY_POWER },
 };
 
-static struct rc_keymap dib0700_rc5_map = {
+static struct rc_map_list dib0700_rc5_map = {
        .map = {
                .scan    = dib0700_rc5_table,
                .size    = ARRAY_SIZE(dib0700_rc5_table),
-               .ir_type = IR_TYPE_RC5,
+               .rc_type = RC_TYPE_RC5,
                .name    = RC_MAP_DIB0700_RC5_TABLE,
        }
 };
 
 static int __init init_rc_map(void)
 {
-       return ir_register_map(&dib0700_rc5_map);
+       return rc_map_register(&dib0700_rc5_map);
 }
 
 static void __exit exit_rc_map(void)
 {
-       ir_unregister_map(&dib0700_rc5_map);
+       rc_map_unregister(&dib0700_rc5_map);
 }
 
 module_init(init_rc_map)