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-em-terratec.c

diff --git a/drivers/media/IR/keymaps/rc-em-terratec.c b/drivers/media/rc/keymaps/rc-em-terratec.c
similarity index 86%
rename from drivers/media/IR/keymaps/rc-em-terratec.c
rename to drivers/media/rc/keymaps/rc-em-terratec.c
index 3130c9c29e6ba2cd0daca855356a4a5c4d70fde1..269d4299da345e7815d40441d7175cb060e97978 100644 (file)
--- a/drivers/media/IR/keymaps/rc-em-terratec.c
+++ b/drivers/media/rc/keymaps/rc-em-terratec.c
@@ -12,7 +12,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode em_terratec[] = {
+static struct rc_map_table em_terratec[] = {
        { 0x01, KEY_CHANNEL },
        { 0x02, KEY_SELECT },
        { 0x03, KEY_MUTE },
@@ -43,23 +43,23 @@ static struct ir_scancode em_terratec[] = {
        { 0x40, KEY_ZOOM },
 };
 
-static struct rc_keymap em_terratec_map = {
+static struct rc_map_list em_terratec_map = {
        .map = {
                .scan    = em_terratec,
                .size    = ARRAY_SIZE(em_terratec),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_EM_TERRATEC,
        }
 };
 
 static int __init init_rc_map_em_terratec(void)
 {
-       return ir_register_map(&em_terratec_map);
+       return rc_map_register(&em_terratec_map);
 }
 
 static void __exit exit_rc_map_em_terratec(void)
 {
-       ir_unregister_map(&em_terratec_map);
+       rc_map_unregister(&em_terratec_map);
 }
 
 module_init(init_rc_map_em_terratec)