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-ati-tv-wonder-hd-600.c

diff --git a/drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c b/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c
similarity index 86%
rename from drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c
rename to drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c
index 8edfd293d01003b7a3ac6d9e8497e7276cd10268..f766b24b01585d9028637b5ecc7c7b0c5491ed60 100644 (file)
--- a/drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c
+++ b/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c
@@ -16,7 +16,7 @@
    Devin Heitmueller <devin.heitmueller@gmail.com>
  */
 
-static struct ir_scancode ati_tv_wonder_hd_600[] = {
+static struct rc_map_table ati_tv_wonder_hd_600[] = {
        { 0x00, KEY_RECORD},            /* Row 1 */
        { 0x01, KEY_PLAYPAUSE},
        { 0x02, KEY_STOP},
@@ -43,23 +43,23 @@ static struct ir_scancode ati_tv_wonder_hd_600[] = {
        { 0x17, KEY_VOLUMEDOWN},
 };
 
-static struct rc_keymap ati_tv_wonder_hd_600_map = {
+static struct rc_map_list ati_tv_wonder_hd_600_map = {
        .map = {
                .scan    = ati_tv_wonder_hd_600,
                .size    = ARRAY_SIZE(ati_tv_wonder_hd_600),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_ATI_TV_WONDER_HD_600,
        }
 };
 
 static int __init init_rc_map_ati_tv_wonder_hd_600(void)
 {
-       return ir_register_map(&ati_tv_wonder_hd_600_map);
+       return rc_map_register(&ati_tv_wonder_hd_600_map);
 }
 
 static void __exit exit_rc_map_ati_tv_wonder_hd_600(void)
 {
-       ir_unregister_map(&ati_tv_wonder_hd_600_map);
+       rc_map_unregister(&ati_tv_wonder_hd_600_map);
 }
 
 module_init(init_rc_map_ati_tv_wonder_hd_600)