diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-14 03:11:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-14 03:11:46 -0400 |
| commit | ed859ed3b0f9893c6bce3708e8928341c15699b9 (patch) | |
| tree | 59c507f00bc13becb4accdd64fdc01ece08b4645 /drivers/media/IR/ir-lirc-codec.c | |
| parent | a8027073eb127cd207070891374b5c54c2ce3d23 (diff) | |
| parent | 53eeb64e808971207350386121f4bab12fa2f45f (diff) | |
Merge branch 'linus' into sched/core
Merge reason: update from -rc5 to -almost-final
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/IR/ir-lirc-codec.c')
| -rw-r--r-- | drivers/media/IR/ir-lirc-codec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/IR/ir-lirc-codec.c b/drivers/media/IR/ir-lirc-codec.c index 77b5946413c0..e63f757d5d72 100644 --- a/drivers/media/IR/ir-lirc-codec.c +++ b/drivers/media/IR/ir-lirc-codec.c | |||
| @@ -267,7 +267,7 @@ static int ir_lirc_register(struct input_dev *input_dev) | |||
| 267 | features |= LIRC_CAN_SET_SEND_CARRIER; | 267 | features |= LIRC_CAN_SET_SEND_CARRIER; |
| 268 | 268 | ||
| 269 | if (ir_dev->props->s_tx_duty_cycle) | 269 | if (ir_dev->props->s_tx_duty_cycle) |
| 270 | features |= LIRC_CAN_SET_REC_DUTY_CYCLE; | 270 | features |= LIRC_CAN_SET_SEND_DUTY_CYCLE; |
| 271 | } | 271 | } |
| 272 | 272 | ||
| 273 | if (ir_dev->props->s_rx_carrier_range) | 273 | if (ir_dev->props->s_rx_carrier_range) |