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

diff --git a/drivers/media/IR/keymaps/rc-purpletv.c b/drivers/media/rc/keymaps/rc-purpletv.c
similarity index 89%
rename from drivers/media/IR/keymaps/rc-purpletv.c
rename to drivers/media/rc/keymaps/rc-purpletv.c
index 4e20fc2269f76fb3de19e38f1b802e0267532a68..ef90296bfd6855502d4cd26dd7ccdea70c812897 100644 (file)
--- a/drivers/media/IR/keymaps/rc-purpletv.c
+++ b/drivers/media/rc/keymaps/rc-purpletv.c
@@ -12,7 +12,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode purpletv[] = {
+static struct rc_map_table purpletv[] = {
        { 0x03, KEY_POWER },
        { 0x6f, KEY_MUTE },
        { 0x10, KEY_BACKSPACE },        /* Recall */
@@ -55,23 +55,23 @@ static struct ir_scancode purpletv[] = {
 
 };
 
-static struct rc_keymap purpletv_map = {
+static struct rc_map_list purpletv_map = {
        .map = {
                .scan    = purpletv,
                .size    = ARRAY_SIZE(purpletv),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_PURPLETV,
        }
 };
 
 static int __init init_rc_map_purpletv(void)
 {
-       return ir_register_map(&purpletv_map);
+       return rc_map_register(&purpletv_map);
 }
 
 static void __exit exit_rc_map_purpletv(void)
 {
-       ir_unregister_map(&purpletv_map);
+       rc_map_unregister(&purpletv_map);
 }
 
 module_init(init_rc_map_purpletv)