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-behold-columbus.c

diff --git a/drivers/media/IR/keymaps/rc-behold-columbus.c b/drivers/media/rc/keymaps/rc-behold-columbus.c
similarity index 91%
rename from drivers/media/IR/keymaps/rc-behold-columbus.c
rename to drivers/media/rc/keymaps/rc-behold-columbus.c
index 9f56c98fef5b94d4f8e356296e61ae380dc67e85..4b787fa94f08cce03be8e2ab28701ea1f3c3ccad 100644 (file)
--- a/drivers/media/IR/keymaps/rc-behold-columbus.c
+++ b/drivers/media/rc/keymaps/rc-behold-columbus.c
@@ -21,7 +21,7 @@
  * helps to descide which keycodes to assign to the buttons.
  */
 
-static struct ir_scancode behold_columbus[] = {
+static struct rc_map_table behold_columbus[] = {
 
        /*  0x13   0x11   0x1C   0x12  *
         *  Mute  Source  TV/FM  Power *
@@ -82,23 +82,23 @@ static struct ir_scancode behold_columbus[] = {
 
 };
 
-static struct rc_keymap behold_columbus_map = {
+static struct rc_map_list behold_columbus_map = {
        .map = {
                .scan    = behold_columbus,
                .size    = ARRAY_SIZE(behold_columbus),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_BEHOLD_COLUMBUS,
        }
 };
 
 static int __init init_rc_map_behold_columbus(void)
 {
-       return ir_register_map(&behold_columbus_map);
+       return rc_map_register(&behold_columbus_map);
 }
 
 static void __exit exit_rc_map_behold_columbus(void)
 {
-       ir_unregister_map(&behold_columbus_map);
+       rc_map_unregister(&behold_columbus_map);
 }
 
 module_init(init_rc_map_behold_columbus)