Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / dvb / dvb-usb / anysee.c

diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c
index 1759d26bca427af2d2e736caaf967e6e9c140244..6b402e943539e03a348e6d8bc762374cd1007d4f 100644 (file)
--- a/drivers/media/dvb/dvb-usb/anysee.c
+++ b/drivers/media/dvb/dvb-usb/anysee.c
@@ -394,7 +394,7 @@ static int anysee_rc_query(struct dvb_usb_device *d)
 
        if (ircode[0]) {
                deb_rc("%s: key pressed %02x\n", __func__, ircode[1]);
-               ir_keydown(d->rc_input_dev, 0x08 << 8 | ircode[1], 0);
+               rc_keydown(d->rc_dev, 0x08 << 8 | ircode[1], 0);
        }
 
        return 0;
@@ -476,7 +476,7 @@ static struct dvb_usb_device_properties anysee_properties = {
 
        .rc.core = {
                .rc_codes         = RC_MAP_ANYSEE,
-               .protocol         = IR_TYPE_OTHER,
+               .protocol         = RC_TYPE_OTHER,
                .module_name      = "anysee",
                .rc_query         = anysee_rc_query,
                .rc_interval      = 250,  /* windows driver uses 500ms */