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-azurewave-ad-tu700.c

diff --git a/drivers/media/IR/keymaps/rc-azurewave-ad-tu700.c b/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c
similarity index 93%
rename from drivers/media/IR/keymaps/rc-azurewave-ad-tu700.c
rename to drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c
index e0876147d471968be91a8cd0af396fc743fe1867..c3f6d62ac8925d76dfc43cfb19620f5a9de420bc 100644 (file)
--- a/drivers/media/IR/keymaps/rc-azurewave-ad-tu700.c
+++ b/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c
@@ -20,7 +20,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode azurewave_ad_tu700[] = {
+static struct rc_map_table azurewave_ad_tu700[] = {
        { 0x0000, KEY_TAB },             /* Tab */
        { 0x0001, KEY_2 },
        { 0x0002, KEY_CHANNELDOWN },
@@ -76,23 +76,23 @@ static struct ir_scancode azurewave_ad_tu700[] = {
        { 0x005f, KEY_BLUE },
 };
 
-static struct rc_keymap azurewave_ad_tu700_map = {
+static struct rc_map_list azurewave_ad_tu700_map = {
        .map = {
                .scan    = azurewave_ad_tu700,
                .size    = ARRAY_SIZE(azurewave_ad_tu700),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_AZUREWAVE_AD_TU700,
        }
 };
 
 static int __init init_rc_map_azurewave_ad_tu700(void)
 {
-       return ir_register_map(&azurewave_ad_tu700_map);
+       return rc_map_register(&azurewave_ad_tu700_map);
 }
 
 static void __exit exit_rc_map_azurewave_ad_tu700(void)
 {
-       ir_unregister_map(&azurewave_ad_tu700_map);
+       rc_map_unregister(&azurewave_ad_tu700_map);
 }
 
 module_init(init_rc_map_azurewave_ad_tu700)