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/video/saa7134/saa7134-input.c | |
| parent | 9d7fd6728e7f6d550d19bb51738711d82c3c507a (diff) | |
| parent | 5ee2472863a4de4edd42451fd86e3d7857602337 (diff) | |
Merge remote branch 'v4l-dvb/master'
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-input.c')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index f8e985989ca0..a4eaf1b75d70 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c @@ -460,7 +460,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) int polling = 0; int rc5_gpio = 0; int nec_gpio = 0; - int ir_type = IR_TYPE_OTHER; + u64 ir_type = IR_TYPE_OTHER; int err; if (dev->has_remote != SAA7134_REMOTE_GPIO) @@ -728,7 +728,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) dev->remote = ir; saa7134_ir_start(dev, ir); - err = ir_input_register(ir->dev, ir_codes); + err = ir_input_register(ir->dev, ir_codes, NULL); if (err) goto err_out_stop; |