git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
drivers
/
media
/
IR
/
ir-lirc-codec.c
diff --git
a/drivers/media/IR/ir-lirc-codec.c
b/drivers/media/IR/ir-lirc-codec.c
index
77b5946
..
e63f757
100644
(file)
--- 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)
features |= LIRC_CAN_SET_SEND_CARRIER;
if (ir_dev->props->s_tx_duty_cycle)
- features |= LIRC_CAN_SET_
REC
_DUTY_CYCLE;
+ features |= LIRC_CAN_SET_
SEND
_DUTY_CYCLE;
}
if (ir_dev->props->s_rx_carrier_range)