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-kworld-315u.c

diff --git a/drivers/media/IR/keymaps/rc-kworld-315u.c b/drivers/media/rc/keymaps/rc-kworld-315u.c
similarity index 89%
rename from drivers/media/IR/keymaps/rc-kworld-315u.c
rename to drivers/media/rc/keymaps/rc-kworld-315u.c
index 618c817374e66c196e381c06a43b71d47b12c51b..3ce6ef79fc347330230ab8c681d5b7f8efddf869 100644 (file)
--- a/drivers/media/IR/keymaps/rc-kworld-315u.c
+++ b/drivers/media/rc/keymaps/rc-kworld-315u.c
@@ -15,7 +15,7 @@
 /* Kworld 315U
  */
 
-static struct ir_scancode kworld_315u[] = {
+static struct rc_map_table kworld_315u[] = {
        { 0x6143, KEY_POWER },
        { 0x6101, KEY_TUNER },          /* source */
        { 0x610b, KEY_ZOOM },
@@ -57,23 +57,23 @@ static struct ir_scancode kworld_315u[] = {
        { 0x611f, KEY_BLUE },
 };
 
-static struct rc_keymap kworld_315u_map = {
+static struct rc_map_list kworld_315u_map = {
        .map = {
                .scan    = kworld_315u,
                .size    = ARRAY_SIZE(kworld_315u),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_KWORLD_315U,
        }
 };
 
 static int __init init_rc_map_kworld_315u(void)
 {
-       return ir_register_map(&kworld_315u_map);
+       return rc_map_register(&kworld_315u_map);
 }
 
 static void __exit exit_rc_map_kworld_315u(void)
 {
-       ir_unregister_map(&kworld_315u_map);
+       rc_map_unregister(&kworld_315u_map);
 }
 
 module_init(init_rc_map_kworld_315u)