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-videomate-s350.c

diff --git a/drivers/media/IR/keymaps/rc-videomate-s350.c b/drivers/media/rc/keymaps/rc-videomate-s350.c
similarity index 88%
rename from drivers/media/IR/keymaps/rc-videomate-s350.c
rename to drivers/media/rc/keymaps/rc-videomate-s350.c
index 4df7fcd1d2fcb8616f92553db543dade2f5405b2..9e474a6024e5acaf3b8a2c829d8bede5aa75fb70 100644 (file)
--- a/drivers/media/IR/keymaps/rc-videomate-s350.c
+++ b/drivers/media/rc/keymaps/rc-videomate-s350.c
@@ -12,7 +12,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode videomate_s350[] = {
+static struct rc_map_table videomate_s350[] = {
        { 0x00, KEY_TV},
        { 0x01, KEY_DVD},
        { 0x04, KEY_RECORD},
@@ -59,23 +59,23 @@ static struct ir_scancode videomate_s350[] = {
        { 0x20, KEY_TEXT},
 };
 
-static struct rc_keymap videomate_s350_map = {
+static struct rc_map_list videomate_s350_map = {
        .map = {
                .scan    = videomate_s350,
                .size    = ARRAY_SIZE(videomate_s350),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_VIDEOMATE_S350,
        }
 };
 
 static int __init init_rc_map_videomate_s350(void)
 {
-       return ir_register_map(&videomate_s350_map);
+       return rc_map_register(&videomate_s350_map);
 }
 
 static void __exit exit_rc_map_videomate_s350(void)
 {
-       ir_unregister_map(&videomate_s350_map);
+       rc_map_unregister(&videomate_s350_map);
 }
 
 module_init(init_rc_map_videomate_s350)