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

diff --git a/drivers/media/IR/keymaps/rc-flyvideo.c b/drivers/media/rc/keymaps/rc-flyvideo.c
similarity index 88%
rename from drivers/media/IR/keymaps/rc-flyvideo.c
rename to drivers/media/rc/keymaps/rc-flyvideo.c
index 9c73043cbdbaf02a0578ef3d19cd527ed37a1c06..5bbe683717568300ed2dc182b15dd266ffa622c0 100644 (file)
--- a/drivers/media/IR/keymaps/rc-flyvideo.c
+++ b/drivers/media/rc/keymaps/rc-flyvideo.c
@@ -12,7 +12,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode flyvideo[] = {
+static struct rc_map_table flyvideo[] = {
        { 0x0f, KEY_0 },
        { 0x03, KEY_1 },
        { 0x04, KEY_2 },
@@ -44,23 +44,23 @@ static struct ir_scancode flyvideo[] = {
        { 0x0a, KEY_ANGLE },    /* no label, may be used as the PAUSE button */
 };
 
-static struct rc_keymap flyvideo_map = {
+static struct rc_map_list flyvideo_map = {
        .map = {
                .scan    = flyvideo,
                .size    = ARRAY_SIZE(flyvideo),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_FLYVIDEO,
        }
 };
 
 static int __init init_rc_map_flyvideo(void)
 {
-       return ir_register_map(&flyvideo_map);
+       return rc_map_register(&flyvideo_map);
 }
 
 static void __exit exit_rc_map_flyvideo(void)
 {
-       ir_unregister_map(&flyvideo_map);
+       rc_map_unregister(&flyvideo_map);
 }
 
 module_init(init_rc_map_flyvideo)