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

diff --git a/drivers/media/IR/keymaps/rc-pixelview.c b/drivers/media/rc/keymaps/rc-pixelview.c
similarity index 89%
rename from drivers/media/IR/keymaps/rc-pixelview.c
rename to drivers/media/rc/keymaps/rc-pixelview.c
index 82ff12e182a05ebe02698e58c26d1191a9699d98..0ec5988916b9a056a7d7c4fa69538823155a3571 100644 (file)
--- a/drivers/media/IR/keymaps/rc-pixelview.c
+++ b/drivers/media/rc/keymaps/rc-pixelview.c
@@ -12,7 +12,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode pixelview[] = {
+static struct rc_map_table pixelview[] = {
 
        { 0x1e, KEY_POWER },    /* power */
        { 0x07, KEY_MEDIA },    /* source */
@@ -56,23 +56,23 @@ static struct ir_scancode pixelview[] = {
        { 0x18, KEY_MUTE },             /* mute/unmute */
 };
 
-static struct rc_keymap pixelview_map = {
+static struct rc_map_list pixelview_map = {
        .map = {
                .scan    = pixelview,
                .size    = ARRAY_SIZE(pixelview),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_PIXELVIEW,
        }
 };
 
 static int __init init_rc_map_pixelview(void)
 {
-       return ir_register_map(&pixelview_map);
+       return rc_map_register(&pixelview_map);
 }
 
 static void __exit exit_rc_map_pixelview(void)
 {
-       ir_unregister_map(&pixelview_map);
+       rc_map_unregister(&pixelview_map);
 }
 
 module_init(init_rc_map_pixelview)