Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 320099
b: refs/heads/master
c: 94f7476
h: refs/heads/master
i:
  320097: a5ed470
  320095: 59d63bf
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Jul 6, 2012
1 parent c9e2cfa commit 583b73a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c455f5c85ab79d065d09915e73c643f4cfa0eb16
refs/heads/master: 94f74767160ab0d288f3b416971cf259f2a38b3d
21 changes: 11 additions & 10 deletions trunk/drivers/media/rc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@ config LIRC
LIRC daemon handles protocol decoding for IR reception and
encoding for IR transmitting (aka "blasting").

config IR_LIRC_CODEC
tristate "Enable IR to LIRC bridge"
depends on RC_CORE
depends on LIRC
default y

---help---
Enable this option to pass raw IR to and from userspace via
the LIRC interface.


config IR_NEC_DECODER
tristate "Enable IR raw decoder for the NEC protocol"
depends on RC_CORE
Expand Down Expand Up @@ -113,16 +124,6 @@ menuconfig RC_DEVICES

if RC_DEVICES

config IR_LIRC_CODEC
tristate "Enable IR to LIRC bridge"
depends on RC_CORE
depends on LIRC
default y

---help---
Enable this option to pass raw IR to and from userspace via
the LIRC interface.

config RC_ATI_REMOTE
tristate "ATI / X10 based USB RF remote controls"
depends on USB_ARCH_HAS_HCD
Expand Down

0 comments on commit 583b73a

Please sign in to comment.