summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/dm1105
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-15 13:56:01 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-15 13:56:01 -0300
commit136a9b83fb4cb819c2f27cbb5948d26cec0e7934 (patch)
tree397919f977ae7937aa60a5001f62f0ba3faef2db /linux/drivers/media/dvb/dm1105
parentfdafaa4f7e2ea516dbd7791f362f05273aaaa6cc (diff)
parentc5d1ee111d9e00f9ce75e48e5e3806fdcd681a83 (diff)
downloadmediapointer-dvb-s2-136a9b83fb4cb819c2f27cbb5948d26cec0e7934.tar.gz
mediapointer-dvb-s2-136a9b83fb4cb819c2f27cbb5948d26cec0e7934.tar.bz2
merge: http://kernellabs.com/hg/~mkrufky/tda18271-merge
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.c2
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;