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 / siano / smscoreapi.c

diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index 135e45bd00c7c9064e9af88b96a55aafc3d2498a..78765ed280631126abdabca42035eff8fe95dcc5 100644 (file)
--- a/drivers/media/dvb/siano/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -438,7 +438,7 @@ static int smscore_init_ir(struct smscore_device_t *coredev)
        int rc;
        void *buffer;
 
-       coredev->ir.input_dev = NULL;
+       coredev->ir.dev = NULL;
        ir_io = sms_get_board(smscore_get_board_id(coredev))->board_cfg.ir;
        if (ir_io) {/* only if IR port exist we use IR sub-module */
                sms_info("IR loading");