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-terratec-cinergy-xs.c

diff --git a/drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c b/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c
similarity index 88%
rename from drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c
rename to drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c
index 5326a0b444c104b0d685f30e70c23d7625351ef4..bc38e34b9fda1cd892ac2fc818f485c2bc5371a1 100644 (file)
--- a/drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c
+++ b/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c
@@ -16,7 +16,7 @@
    Devin Heitmueller <dheitmueller@linuxtv.org>
  */
 
-static struct ir_scancode terratec_cinergy_xs[] = {
+static struct rc_map_table terratec_cinergy_xs[] = {
        { 0x41, KEY_HOME},
        { 0x01, KEY_POWER},
        { 0x42, KEY_MENU},
@@ -66,23 +66,23 @@ static struct ir_scancode terratec_cinergy_xs[] = {
        { 0x5c, KEY_NEXT},
 };
 
-static struct rc_keymap terratec_cinergy_xs_map = {
+static struct rc_map_list terratec_cinergy_xs_map = {
        .map = {
                .scan    = terratec_cinergy_xs,
                .size    = ARRAY_SIZE(terratec_cinergy_xs),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_TERRATEC_CINERGY_XS,
        }
 };
 
 static int __init init_rc_map_terratec_cinergy_xs(void)
 {
-       return ir_register_map(&terratec_cinergy_xs_map);
+       return rc_map_register(&terratec_cinergy_xs_map);
 }
 
 static void __exit exit_rc_map_terratec_cinergy_xs(void)
 {
-       ir_unregister_map(&terratec_cinergy_xs_map);
+       rc_map_unregister(&terratec_cinergy_xs_map);
 }
 
 module_init(init_rc_map_terratec_cinergy_xs)