summaryrefslogtreecommitdiff
path: root/drivers/media/rc/Makefile
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2014-04-04 03:32:31 +0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-26 02:10:44 +0400
commite87b540be2dd02552fb9244d50ae8b4e4619a34b (patch)
tree4440e341a8b937890c7a772fa709a1063ade3ef9 /drivers/media/rc/Makefile
parent9d2f1d3cdedd4d3efff8d14f1f49cf73e2f5cc36 (diff)
downloadlinux-e87b540be2dd02552fb9244d50ae8b4e4619a34b.tar.xz
[media] rc-core: merge rc5 and streamzap decoders
Now that the protocol is part of the scancode, it is pretty easy to merge the rc5 and streamzap decoders. An additional advantage is that the decoder is now stricter as it waits for the trailing silence before determining that a command is a valid rc5/streamzap command (which avoids collisions that I've seen with e.g. Sony protocols). Signed-off-by: David Härdeman <david@hardeman.nu> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/rc/Makefile')
-rw-r--r--drivers/media/rc/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 9ee9ee75ae8d..d07576f417dc 100644
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -9,7 +9,6 @@ obj-$(CONFIG_IR_RC5_DECODER) += ir-rc5-decoder.o
obj-$(CONFIG_IR_RC6_DECODER) += ir-rc6-decoder.o
obj-$(CONFIG_IR_JVC_DECODER) += ir-jvc-decoder.o
obj-$(CONFIG_IR_SONY_DECODER) += ir-sony-decoder.o
-obj-$(CONFIG_IR_RC5_SZ_DECODER) += ir-rc5-sz-decoder.o
obj-$(CONFIG_IR_SANYO_DECODER) += ir-sanyo-decoder.o
obj-$(CONFIG_IR_SHARP_DECODER) += ir-sharp-decoder.o
obj-$(CONFIG_IR_MCE_KBD_DECODER) += ir-mce_kbd-decoder.o