diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 11:53:31 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 11:53:31 -0300 |
commit | 4c691e7dabc47811013c7266fa5f32fe96687c36 (patch) | |
tree | a6185d7724be9b53607ab988625fd75052b1a9b2 /linux/drivers/media/dvb/dm1105 | |
parent | 8201f56625ffdc9146ad8eb4525c1b50e6194f5a (diff) | |
parent | 4198bf24c30e208e3c1a4d833e52ee2330bdb008 (diff) | |
download | mediapointer-dvb-s2-4c691e7dabc47811013c7266fa5f32fe96687c36.tar.gz mediapointer-dvb-s2-4c691e7dabc47811013c7266fa5f32fe96687c36.tar.bz2 |
merge: http://kernellabs.com/hg/~dheitmueller/em28xx-vbi3
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/dm1105')
-rw-r--r-- | linux/drivers/media/dvb/dm1105/dm1105.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dm1105/dm1105.c b/linux/drivers/media/dvb/dm1105/dm1105.c index f937151b3..874f976af 100644 --- a/linux/drivers/media/dvb/dm1105/dm1105.c +++ b/linux/drivers/media/dvb/dm1105/dm1105.c @@ -600,7 +600,7 @@ static irqreturn_t dm1105dvb_irq(int irq, void *dev_id) int __devinit dm1105_ir_init(struct dm1105dvb *dm1105) { struct input_dev *input_dev; - IR_KEYTAB_TYPE *ir_codes = ir_codes_dm1105_nec; + struct ir_scancode_table *ir_codes = &ir_codes_dm1105_nec_table; int ir_type = IR_TYPE_OTHER; int err = -ENOMEM; |