Merge branch 'master' into tk71

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

diff --git a/drivers/media/IR/keymaps/rc-npgtech.c b/drivers/media/rc/keymaps/rc-npgtech.c
similarity index 89%
rename from drivers/media/IR/keymaps/rc-npgtech.c
rename to drivers/media/rc/keymaps/rc-npgtech.c
index b9ece1e9029664c9eab2896f7ba6a3b8ec588e07..4aa588bf6d6917f79ff9f0ad77360ad50064230a 100644 (file)
--- a/drivers/media/IR/keymaps/rc-npgtech.c
+++ b/drivers/media/rc/keymaps/rc-npgtech.c
@@ -12,7 +12,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode npgtech[] = {
+static struct rc_map_table npgtech[] = {
        { 0x1d, KEY_SWITCHVIDEOMODE },  /* switch inputs */
        { 0x2a, KEY_FRONT },
 
@@ -54,23 +54,23 @@ static struct ir_scancode npgtech[] = {
 
 };
 
-static struct rc_keymap npgtech_map = {
+static struct rc_map_list npgtech_map = {
        .map = {
                .scan    = npgtech,
                .size    = ARRAY_SIZE(npgtech),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_NPGTECH,
        }
 };
 
 static int __init init_rc_map_npgtech(void)
 {
-       return ir_register_map(&npgtech_map);
+       return rc_map_register(&npgtech_map);
 }
 
 static void __exit exit_rc_map_npgtech(void)
 {
-       ir_unregister_map(&npgtech_map);
+       rc_map_unregister(&npgtech_map);
 }
 
 module_init(init_rc_map_npgtech)