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

diff --git a/drivers/media/IR/keymaps/rc-digittrade.c b/drivers/media/rc/keymaps/rc-digittrade.c
similarity index 92%
rename from drivers/media/IR/keymaps/rc-digittrade.c
rename to drivers/media/rc/keymaps/rc-digittrade.c
index 5dece78e19c5f2b302b2ed8c2008c23b7d8e369f..21d49871f2a3cdc8ef53456b0430edcd78cf3dc4 100644 (file)
--- a/drivers/media/IR/keymaps/rc-digittrade.c
+++ b/drivers/media/rc/keymaps/rc-digittrade.c
@@ -25,7 +25,7 @@
    Initial keytable was from Alain Kalker <miki@dds.nl> */
 
 /* Digittrade DVB-T USB Stick */
-static struct ir_scancode digittrade[] = {
+static struct rc_map_table digittrade[] = {
        { 0x0000, KEY_9 },
        { 0x0001, KEY_EPG },             /* EPG */
        { 0x0002, KEY_VOLUMEDOWN },      /* Vol Dn */
@@ -56,23 +56,23 @@ static struct ir_scancode digittrade[] = {
        { 0x0054, KEY_0 },
 };
 
-static struct rc_keymap digittrade_map = {
+static struct rc_map_list digittrade_map = {
        .map = {
                .scan    = digittrade,
                .size    = ARRAY_SIZE(digittrade),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_DIGITTRADE,
        }
 };
 
 static int __init init_rc_map_digittrade(void)
 {
-       return ir_register_map(&digittrade_map);
+       return rc_map_register(&digittrade_map);
 }
 
 static void __exit exit_rc_map_digittrade(void)
 {
-       ir_unregister_map(&digittrade_map);
+       rc_map_unregister(&digittrade_map);
 }
 
 module_init(init_rc_map_digittrade)