aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-11-22 11:51:28 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-01 20:57:07 -0200
commitef5bf8d67983faca883f85f14f3e98861b35a6e3 (patch)
tree77e7fe6374052a2cdb53528841d71aef1015fb44 /drivers/media
parent8878ca1fb36791125b714e00fc9a766efa8f8c9e (diff)
[media] Fix some merge conflicts with rc-core renames and technisat usb2
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/technisat-usb2.c2
-rw-r--r--drivers/media/rc/keymaps/rc-technisat-usb2.c14
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/dvb/dvb-usb/technisat-usb2.c b/drivers/media/dvb/dvb-usb/technisat-usb2.c
index b0e35e949087..cce1559f7bfe 100644
--- a/drivers/media/dvb/dvb-usb/technisat-usb2.c
+++ b/drivers/media/dvb/dvb-usb/technisat-usb2.c
@@ -729,7 +729,7 @@ static struct dvb_usb_device_properties technisat_usb2_devices = {
.rc_codes = RC_MAP_TECHNISAT_USB2,
.module_name = "technisat-usb2",
.rc_query = technisat_usb2_rc_query,
- .allowed_protos = IR_TYPE_ALL,
+ .allowed_protos = RC_TYPE_ALL,
.driver_type = RC_DRIVER_IR_RAW,
}
};
diff --git a/drivers/media/rc/keymaps/rc-technisat-usb2.c b/drivers/media/rc/keymaps/rc-technisat-usb2.c
index 98392228a7e2..4afe5774f192 100644
--- a/drivers/media/rc/keymaps/rc-technisat-usb2.c
+++ b/drivers/media/rc/keymaps/rc-technisat-usb2.c
@@ -31,7 +31,7 @@
#include <media/rc-map.h>
-static struct ir_scancode technisat_usb2_rc_keys[] = {
+static struct rc_map_table technisat_usb2[] = {
{0x0a0c, KEY_POWER},
{0x0a01, KEY_1},
{0x0a02, KEY_2},
@@ -67,23 +67,23 @@ static struct ir_scancode technisat_usb2_rc_keys[] = {
{0x0a0a, KEY_PROGRAM},
};
-static struct rc_keymap technisat_usb2_map = {
+static struct rc_map_list technisat_usb2_map = {
.map = {
- .scan = technisat_usb2_rc_keys,
- .size = ARRAY_SIZE(technisat_usb2_rc_keys),
- .ir_type = IR_TYPE_RC5,
+ .scan = technisat_usb2,
+ .size = ARRAY_SIZE(technisat_usb2),
+ .rc_type = RC_TYPE_RC5,
.name = RC_MAP_TECHNISAT_USB2,
}
};
static int __init init_rc_map(void)
{
- return ir_register_map(&technisat_usb2_map);
+ return rc_map_register(&technisat_usb2_map);
}
static void __exit exit_rc_map(void)
{
- ir_unregister_map(&technisat_usb2_map);
+ rc_map_unregister(&technisat_usb2_map);
}
module_init(init_rc_map)

Privacy Policy