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

diff --git a/drivers/media/IR/keymaps/rc-nec-terratec-cinergy-xs.c b/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c
similarity index 89%
rename from drivers/media/IR/keymaps/rc-nec-terratec-cinergy-xs.c
rename to drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c
index e1b54d20db600fe7d0cb47ce24f42e887f2fc8b4..26f114c5c0dee70f4469b4fdd8fa604d76714ea3 100644 (file)
--- a/drivers/media/IR/keymaps/rc-nec-terratec-cinergy-xs.c
+++ b/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c
@@ -16,7 +16,7 @@
    Mauro Carvalho Chehab <mchehab@redhat.com>
  */
 
-static struct ir_scancode nec_terratec_cinergy_xs[] = {
+static struct rc_map_table nec_terratec_cinergy_xs[] = {
        { 0x1441, KEY_HOME},
        { 0x1401, KEY_POWER2},
 
@@ -79,23 +79,23 @@ static struct ir_scancode nec_terratec_cinergy_xs[] = {
        { 0x145c, KEY_NEXT},
 };
 
-static struct rc_keymap nec_terratec_cinergy_xs_map = {
+static struct rc_map_list nec_terratec_cinergy_xs_map = {
        .map = {
                .scan    = nec_terratec_cinergy_xs,
                .size    = ARRAY_SIZE(nec_terratec_cinergy_xs),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_NEC_TERRATEC_CINERGY_XS,
        }
 };
 
 static int __init init_rc_map_nec_terratec_cinergy_xs(void)
 {
-       return ir_register_map(&nec_terratec_cinergy_xs_map);
+       return rc_map_register(&nec_terratec_cinergy_xs_map);
 }
 
 static void __exit exit_rc_map_nec_terratec_cinergy_xs(void)
 {
-       ir_unregister_map(&nec_terratec_cinergy_xs_map);
+       rc_map_unregister(&nec_terratec_cinergy_xs_map);
 }
 
 module_init(init_rc_map_nec_terratec_cinergy_xs)