Commit e6626716 authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab
Browse files

[media] rc: promote lirc_sir out of staging 



Rename lirc_sir to sir_ir in the process.

Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 8c7c6cad

drivers/media/rc/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -426,4 +426,13 @@ config IR_SERIAL_TRANSMITTER 
	---help---

	   Serial Port Transmitter support



config IR_SIR

        tristate "Built-in SIR IrDA port"

        depends on RC_CORE

        ---help---

	   Say Y if you want to use a IrDA SIR port Transceivers.



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

	   be called sir-ir.



endif #RC_DEVICES

drivers/media/rc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -39,4 +39,5 @@ obj-$(CONFIG_RC_ST) += st_rc.o 
obj-$(CONFIG_IR_SUNXI) += sunxi-cir.o

obj-$(CONFIG_IR_IMG) += img-ir/

obj-$(CONFIG_IR_SERIAL) += serial_ir.o

obj-$(CONFIG_IR_SIR) += sir_ir.o

obj-$(CONFIG_IR_MTK) += mtk-cir.o

drivers/staging/media/lirc/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -18,12 +18,6 @@ config LIRC_SASEM 
	help

	  Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module



config LIRC_SIR

	tristate "Built-in SIR IrDA port"

	depends on RC_CORE

	help

	  Driver for the SIR IrDA port



config LIRC_ZILOG

	tristate "Zilog/Hauppauge IR Transmitter"

	depends on LIRC && I2C

drivers/staging/media/lirc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -4,5 +4,4 @@ 
# Each configuration option enables a list of files.



obj-$(CONFIG_LIRC_SASEM)	+= lirc_sasem.o

obj-$(CONFIG_LIRC_SIR)		+= lirc_sir.o

obj-$(CONFIG_LIRC_ZILOG)	+= lirc_zilog.o