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-dntv-live-dvb-t.c

diff --git a/drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c b/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c
similarity index 88%
rename from drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c
rename to drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c
index 8a4027af964a23766402d2501723509c388c0ac9..43912bd02a9e94201a49a6925bc794173a2ac44c 100644 (file)
--- a/drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c
+++ b/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c
@@ -14,7 +14,7 @@
 
 /* DigitalNow DNTV Live DVB-T Remote */
 
-static struct ir_scancode dntv_live_dvb_t[] = {
+static struct rc_map_table dntv_live_dvb_t[] = {
        { 0x00, KEY_ESC },              /* 'go up a level?' */
        /* Keys 0 to 9 */
        { 0x0a, KEY_0 },
@@ -52,23 +52,23 @@ static struct ir_scancode dntv_live_dvb_t[] = {
        { 0x1f, KEY_VOLUMEDOWN },
 };
 
-static struct rc_keymap dntv_live_dvb_t_map = {
+static struct rc_map_list dntv_live_dvb_t_map = {
        .map = {
                .scan    = dntv_live_dvb_t,
                .size    = ARRAY_SIZE(dntv_live_dvb_t),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_DNTV_LIVE_DVB_T,
        }
 };
 
 static int __init init_rc_map_dntv_live_dvb_t(void)
 {
-       return ir_register_map(&dntv_live_dvb_t_map);
+       return rc_map_register(&dntv_live_dvb_t_map);
 }
 
 static void __exit exit_rc_map_dntv_live_dvb_t(void)
 {
-       ir_unregister_map(&dntv_live_dvb_t_map);
+       rc_map_unregister(&dntv_live_dvb_t_map);
 }
 
 module_init(init_rc_map_dntv_live_dvb_t)