diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /drivers/media/video/cx23885/cx23885-input.c | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-input.c')
| -rw-r--r-- | drivers/media/video/cx23885/cx23885-input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c index 768eec92ccf9..9c6620f86dca 100644 --- a/drivers/media/video/cx23885/cx23885-input.c +++ b/drivers/media/video/cx23885/cx23885-input.c | |||
| @@ -397,7 +397,7 @@ int cx23885_input_init(struct cx23885_dev *dev) | |||
| 397 | dev->ir_input = ir; | 397 | dev->ir_input = ir; |
| 398 | cx23885_input_ir_start(dev); | 398 | cx23885_input_ir_start(dev); |
| 399 | 399 | ||
| 400 | ret = ir_input_register(ir->dev, ir_codes); | 400 | ret = ir_input_register(ir->dev, ir_codes, NULL); |
| 401 | if (ret) | 401 | if (ret) |
| 402 | goto err_out_stop; | 402 | goto err_out_stop; |
| 403 | 403 | ||