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

diff --git a/drivers/media/IR/keymaps/rc-pixelview-new.c b/drivers/media/rc/keymaps/rc-pixelview-new.c
similarity index 88%
rename from drivers/media/IR/keymaps/rc-pixelview-new.c
rename to drivers/media/rc/keymaps/rc-pixelview-new.c
index 7bbbbf5735e6f36f559f9b8fb59778c7815ec9e5..777a70076be2d9aeb25f2e8c45d9d9ea95caf7e5 100644 (file)
--- a/drivers/media/IR/keymaps/rc-pixelview-new.c
+++ b/drivers/media/rc/keymaps/rc-pixelview-new.c
@@ -17,7 +17,7 @@
    present on PV MPEG 8000GT
  */
 
-static struct ir_scancode pixelview_new[] = {
+static struct rc_map_table pixelview_new[] = {
        { 0x3c, KEY_TIME },             /* Timeshift */
        { 0x12, KEY_POWER },
 
@@ -57,23 +57,23 @@ static struct ir_scancode pixelview_new[] = {
        { 0x34, KEY_RADIO },
 };
 
-static struct rc_keymap pixelview_new_map = {
+static struct rc_map_list pixelview_new_map = {
        .map = {
                .scan    = pixelview_new,
                .size    = ARRAY_SIZE(pixelview_new),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_PIXELVIEW_NEW,
        }
 };
 
 static int __init init_rc_map_pixelview_new(void)
 {
-       return ir_register_map(&pixelview_new_map);
+       return rc_map_register(&pixelview_new_map);
 }
 
 static void __exit exit_rc_map_pixelview_new(void)
 {
-       ir_unregister_map(&pixelview_new_map);
+       rc_map_unregister(&pixelview_new_map);
 }
 
 module_init(init_rc_map_pixelview_new)