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-pinnacle-color.c

diff --git a/drivers/media/IR/keymaps/rc-pinnacle-color.c b/drivers/media/rc/keymaps/rc-pinnacle-color.c
similarity index 88%
rename from drivers/media/IR/keymaps/rc-pinnacle-color.c
rename to drivers/media/rc/keymaps/rc-pinnacle-color.c
index 326e023ce1267c255be1864a9e82749b95cdc2b4..23b8c505c6aac89db53be24a93f3dff3e4948844 100644 (file)
--- a/drivers/media/IR/keymaps/rc-pinnacle-color.c
+++ b/drivers/media/rc/keymaps/rc-pinnacle-color.c
@@ -12,7 +12,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode pinnacle_color[] = {
+static struct rc_map_table pinnacle_color[] = {
        { 0x59, KEY_MUTE },
        { 0x4a, KEY_POWER },
 
@@ -68,23 +68,23 @@ static struct ir_scancode pinnacle_color[] = {
        { 0x0a, KEY_BACKSPACE },
 };
 
-static struct rc_keymap pinnacle_color_map = {
+static struct rc_map_list pinnacle_color_map = {
        .map = {
                .scan    = pinnacle_color,
                .size    = ARRAY_SIZE(pinnacle_color),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_PINNACLE_COLOR,
        }
 };
 
 static int __init init_rc_map_pinnacle_color(void)
 {
-       return ir_register_map(&pinnacle_color_map);
+       return rc_map_register(&pinnacle_color_map);
 }
 
 static void __exit exit_rc_map_pinnacle_color(void)
 {
-       ir_unregister_map(&pinnacle_color_map);
+       rc_map_unregister(&pinnacle_color_map);
 }
 
 module_init(init_rc_map_pinnacle_color)