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-slim.c

diff --git a/drivers/media/IR/keymaps/rc-terratec-slim.c b/drivers/media/rc/keymaps/rc-terratec-slim.c
similarity index 91%
rename from drivers/media/IR/keymaps/rc-terratec-slim.c
rename to drivers/media/rc/keymaps/rc-terratec-slim.c
index 10dee4c1deff8351912b3975d118e80eb088f694..1abafa5fd303587d719d5551750180505131750e 100644 (file)
--- a/drivers/media/IR/keymaps/rc-terratec-slim.c
+++ b/drivers/media/rc/keymaps/rc-terratec-slim.c
@@ -22,7 +22,7 @@
 
 /* TerraTec slim remote, 7 rows, 4 columns. */
 /* Uses NEC extended 0x02bd. */
-static struct ir_scancode terratec_slim[] = {
+static struct rc_map_table terratec_slim[] = {
        { 0x02bd00, KEY_1 },
        { 0x02bd01, KEY_2 },
        { 0x02bd02, KEY_3 },
@@ -53,23 +53,23 @@ static struct ir_scancode terratec_slim[] = {
        { 0x02bd45, KEY_POWER2 },          /* [red power button] */
 };
 
-static struct rc_keymap terratec_slim_map = {
+static struct rc_map_list terratec_slim_map = {
        .map = {
                .scan    = terratec_slim,
                .size    = ARRAY_SIZE(terratec_slim),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_TERRATEC_SLIM,
        }
 };
 
 static int __init init_rc_map_terratec_slim(void)
 {
-       return ir_register_map(&terratec_slim_map);
+       return rc_map_register(&terratec_slim_map);
 }
 
 static void __exit exit_rc_map_terratec_slim(void)
 {
-       ir_unregister_map(&terratec_slim_map);
+       rc_map_unregister(&terratec_slim_map);
 }
 
 module_init(init_rc_map_terratec_slim)