Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / media / rc / keymaps / rc-avermedia-a16d.c

diff --git a/drivers/media/IR/keymaps/rc-avermedia-a16d.c b/drivers/media/rc/keymaps/rc-avermedia-a16d.c
similarity index 86%
rename from drivers/media/IR/keymaps/rc-avermedia-a16d.c
rename to drivers/media/rc/keymaps/rc-avermedia-a16d.c
index 12f043587f2ec871519a9eb37117ea2422308230..ec9beeebd4107b798bf939aace91dc4ed944f98a 100644 (file)
--- a/drivers/media/IR/keymaps/rc-avermedia-a16d.c
+++ b/drivers/media/rc/keymaps/rc-avermedia-a16d.c
@@ -12,7 +12,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode avermedia_a16d[] = {
+static struct rc_map_table avermedia_a16d[] = {
        { 0x20, KEY_LIST},
        { 0x00, KEY_POWER},
        { 0x28, KEY_1},
@@ -49,23 +49,23 @@ static struct ir_scancode avermedia_a16d[] = {
        { 0x2a, KEY_MENU},
 };
 
-static struct rc_keymap avermedia_a16d_map = {
+static struct rc_map_list avermedia_a16d_map = {
        .map = {
                .scan    = avermedia_a16d,
                .size    = ARRAY_SIZE(avermedia_a16d),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_AVERMEDIA_A16D,
        }
 };
 
 static int __init init_rc_map_avermedia_a16d(void)
 {
-       return ir_register_map(&avermedia_a16d_map);
+       return rc_map_register(&avermedia_a16d_map);
 }
 
 static void __exit exit_rc_map_avermedia_a16d(void)
 {
-       ir_unregister_map(&avermedia_a16d_map);
+       rc_map_unregister(&avermedia_a16d_map);
 }
 
 module_init(init_rc_map_avermedia_a16d)