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-alink-dtu-m.c

diff --git a/drivers/media/IR/keymaps/rc-alink-dtu-m.c b/drivers/media/rc/keymaps/rc-alink-dtu-m.c
similarity index 89%
rename from drivers/media/IR/keymaps/rc-alink-dtu-m.c
rename to drivers/media/rc/keymaps/rc-alink-dtu-m.c
index ddfee7f8093d90200a03423abdcd6e4b3c2c3aac..fe652e928dc0d660b61227d800d647fac854fcf7 100644 (file)
--- a/drivers/media/IR/keymaps/rc-alink-dtu-m.c
+++ b/drivers/media/rc/keymaps/rc-alink-dtu-m.c
@@ -21,7 +21,7 @@
 #include <media/rc-map.h>
 
 /* A-Link DTU(m) slim remote, 6 rows, 3 columns. */
-static struct ir_scancode alink_dtu_m[] = {
+static struct rc_map_table alink_dtu_m[] = {
        { 0x0800, KEY_VOLUMEUP },
        { 0x0801, KEY_1 },
        { 0x0802, KEY_3 },
@@ -42,23 +42,23 @@ static struct ir_scancode alink_dtu_m[] = {
        { 0x081d, KEY_CHANNELDOWN },
 };
 
-static struct rc_keymap alink_dtu_m_map = {
+static struct rc_map_list alink_dtu_m_map = {
        .map = {
                .scan    = alink_dtu_m,
                .size    = ARRAY_SIZE(alink_dtu_m),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_ALINK_DTU_M,
        }
 };
 
 static int __init init_rc_map_alink_dtu_m(void)
 {
-       return ir_register_map(&alink_dtu_m_map);
+       return rc_map_register(&alink_dtu_m_map);
 }
 
 static void __exit exit_rc_map_alink_dtu_m(void)
 {
-       ir_unregister_map(&alink_dtu_m_map);
+       rc_map_unregister(&alink_dtu_m_map);
 }
 
 module_init(init_rc_map_alink_dtu_m)