diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-19 09:36:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-19 09:36:18 +1100 |
| commit | 1d71fabde140876e84f5111cf6828223de356352 (patch) | |
| tree | 04c3510b82eb1f58cdcd801103d5d624d3fa2ea4 /drivers/media/dvb/dm1105/dm1105.c | |
| parent | 9d7fd6728e7f6d550d19bb51738711d82c3c507a (diff) | |
| parent | 5ee2472863a4de4edd42451fd86e3d7857602337 (diff) | |
Merge remote branch 'v4l-dvb/master'
Diffstat (limited to 'drivers/media/dvb/dm1105/dm1105.c')
| -rw-r--r-- | drivers/media/dvb/dm1105/dm1105.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c index f0f483ac8b89..aadf803c261c 100644 --- a/drivers/media/dvb/dm1105/dm1105.c +++ b/drivers/media/dvb/dm1105/dm1105.c @@ -578,7 +578,7 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105) { struct input_dev *input_dev; struct ir_scancode_table *ir_codes = &ir_codes_dm1105_nec_table; - int ir_type = IR_TYPE_OTHER; + u64 ir_type = IR_TYPE_OTHER; int err = -ENOMEM; input_dev = input_allocate_device(); @@ -611,7 +611,7 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105) INIT_WORK(&dm1105->ir.work, dm1105_emit_key); - err = ir_input_register(input_dev, ir_codes); + err = ir_input_register(input_dev, ir_codes, NULL); return err; } |