Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c1101d5 authored by Jarod Wilson's avatar Jarod Wilson Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: IR: put newly ported streamzap driver in proper home 



Moves drivers/staging/lirc/lirc_streamzap.c to
drivers/media/IR/streamzap.c, along with making the requisite Kconfig
and Makefile changes.

Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8e9e6064

drivers/media/IR/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -103,3 +103,15 @@ config IR_MCEUSB 


	   To compile this driver as a module, choose M here: the

	   module will be called mceusb.



config IR_STREAMZAP

	tristate "Streamzap PC Remote IR Receiver"

	depends on USB_ARCH_HAS_HCD

	depends on IR_CORE

	select USB

	---help---

	   Say Y here if you want to use a Streamzap PC Remote

	   Infrared Receiver.



	   To compile this driver as a module, choose M here: the

	   module will be called streamzap.

drivers/media/IR/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -16,3 +16,4 @@ obj-$(CONFIG_IR_LIRC_CODEC) += ir-lirc-codec.o 
# stand-alone IR receivers/transmitters

obj-$(CONFIG_IR_IMON) += imon.o

obj-$(CONFIG_IR_MCEUSB) += mceusb.o

obj-$(CONFIG_IR_STREAMZAP) += streamzap.o

drivers/staging/lirc/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -90,12 +90,6 @@ config LIRC_SIR 
	help

	  Driver for the SIR IrDA port



config LIRC_STREAMZAP

	tristate "Streamzap PC Receiver"

	depends on LIRC_STAGING && USB

	help

	  Driver for the Streamzap PC Receiver



config LIRC_TTUSBIR

	tristate "Technotrend USB IR Receiver"

	depends on LIRC_STAGING && USB

drivers/staging/lirc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -14,6 +14,5 @@ obj-$(CONFIG_LIRC_PARALLEL) += lirc_parallel.o 
obj-$(CONFIG_LIRC_SASEM)	+= lirc_sasem.o

obj-$(CONFIG_LIRC_SERIAL)	+= lirc_serial.o

obj-$(CONFIG_LIRC_SIR)		+= lirc_sir.o

obj-$(CONFIG_LIRC_STREAMZAP)	+= lirc_streamzap.o

obj-$(CONFIG_LIRC_TTUSBIR)	+= lirc_ttusbir.o

obj-$(CONFIG_LIRC_ZILOG)	+= lirc_zilog.o