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-pinnacle-grey.c

diff --git a/drivers/media/IR/keymaps/rc-pinnacle-grey.c b/drivers/media/rc/keymaps/rc-pinnacle-grey.c
similarity index 88%
rename from drivers/media/IR/keymaps/rc-pinnacle-grey.c
rename to drivers/media/rc/keymaps/rc-pinnacle-grey.c
index 14cb772515c6ac5e9df8ccf5712f69cdd6d73d39..6ba8c368d10a6ba5e0cf6ca55e6e4b12a1c6269b 100644 (file)
--- a/drivers/media/IR/keymaps/rc-pinnacle-grey.c
+++ b/drivers/media/rc/keymaps/rc-pinnacle-grey.c
@@ -12,7 +12,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode pinnacle_grey[] = {
+static struct rc_map_table pinnacle_grey[] = {
        { 0x3a, KEY_0 },
        { 0x31, KEY_1 },
        { 0x32, KEY_2 },
@@ -63,23 +63,23 @@ static struct ir_scancode pinnacle_grey[] = {
        { 0x18, KEY_EPG },
 };
 
-static struct rc_keymap pinnacle_grey_map = {
+static struct rc_map_list pinnacle_grey_map = {
        .map = {
                .scan    = pinnacle_grey,
                .size    = ARRAY_SIZE(pinnacle_grey),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_PINNACLE_GREY,
        }
 };
 
 static int __init init_rc_map_pinnacle_grey(void)
 {
-       return ir_register_map(&pinnacle_grey_map);
+       return rc_map_register(&pinnacle_grey_map);
 }
 
 static void __exit exit_rc_map_pinnacle_grey(void)
 {
-       ir_unregister_map(&pinnacle_grey_map);
+       rc_map_unregister(&pinnacle_grey_map);
 }
 
 module_init(init_rc_map_pinnacle_grey)