[media] rc: promote lirc_sir out of staging

Rename lirc_sir to sir_ir in the process.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index d1d3fd00ed89664a2dab5d4b4bd8178f028ca913..e422f3d56f76a831a9214fdfc989028ed7ec23f0 100644 (file)
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -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

diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 679aa0af85cd65d30d4bba4b1216eafdfeab4d98..245e2c2d0b223b94e93961b33a63fd8bdaacfc79 100644 (file)
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -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

diff --git a/drivers/staging/media/lirc/lirc_sir.c b/drivers/media/rc/sir_ir.c
similarity index 100%
rename from drivers/staging/media/lirc/lirc_sir.c
rename to drivers/media/rc/sir_ir.c

diff --git a/drivers/staging/media/lirc/Kconfig b/drivers/staging/media/lirc/Kconfig
index bc67da254262318f43cb81ab58fb2053339f2e73..e0206516c09ebca965c3f8962efeeae8f86f30a9 100644 (file)
--- a/drivers/staging/media/lirc/Kconfig
+++ b/drivers/staging/media/lirc/Kconfig
@@ -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

diff --git a/drivers/staging/media/lirc/Makefile b/drivers/staging/media/lirc/Makefile
index 28740c94349c4e412ee0b77bc800c8fb0705297c..70f2237dbf4712ea173e4c98362a61e7a8aa6e9e 100644 (file)
--- a/drivers/staging/media/lirc/Makefile
+++ b/drivers/staging/media/lirc/Makefile
@@ -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