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-imon-pad.c

diff --git a/drivers/media/IR/keymaps/rc-imon-pad.c b/drivers/media/rc/keymaps/rc-imon-pad.c
similarity index 95%
rename from drivers/media/IR/keymaps/rc-imon-pad.c
rename to drivers/media/rc/keymaps/rc-imon-pad.c
index bc4db72f02e6a0083bb4a285768f4e665111d7f5..eef46b73ca7b8532e0a13aa0afa4fdc93524798c 100644 (file)
--- a/drivers/media/IR/keymaps/rc-imon-pad.c
+++ b/drivers/media/rc/keymaps/rc-imon-pad.c
@@ -17,7 +17,7 @@
  * same remote to different hex codes, and the silkscreened names
  * vary a bit between the SoundGraph and Antec remotes... ugh.
  */
-static struct ir_scancode imon_pad[] = {
+static struct rc_map_table imon_pad[] = {
        /* keys sorted mostly by frequency of use to optimize lookups */
        { 0x2a8195b7, KEY_REWIND },
        { 0x298315b7, KEY_REWIND },
@@ -129,24 +129,24 @@ static struct ir_scancode imon_pad[] = {
        { 0x29b715b7, KEY_DASHBOARD }, /* AppLauncher */
 };
 
-static struct rc_keymap imon_pad_map = {
+static struct rc_map_list imon_pad_map = {
        .map = {
                .scan    = imon_pad,
                .size    = ARRAY_SIZE(imon_pad),
                /* actual protocol details unknown, hardware decoder */
-               .ir_type = IR_TYPE_OTHER,
+               .rc_type = RC_TYPE_OTHER,
                .name    = RC_MAP_IMON_PAD,
        }
 };
 
 static int __init init_rc_map_imon_pad(void)
 {
-       return ir_register_map(&imon_pad_map);
+       return rc_map_register(&imon_pad_map);
 }
 
 static void __exit exit_rc_map_imon_pad(void)
 {
-       ir_unregister_map(&imon_pad_map);
+       rc_map_unregister(&imon_pad_map);
 }
 
 module_init(init_rc_map_imon_pad)