[media] lirc_serial: move out of staging and rename to serial_ir

Signed-off-by: Sean Young <sean@mess.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 3db2078..52cc077 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10631,6 +10631,12 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/serial/
 F:     drivers/tty/serial/
 
+SERIAL IR RECEIVER
+M:     Sean Young <sean@mess.org>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/rc/serial_ir.c
+
 STI CEC DRIVER
 M:     Benjamin Gaignard <benjamin.gaignard@linaro.org>
 L:     kernel@stlinux.com

diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index 370e16e..629e8ca 100644 (file)
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -389,4 +389,21 @@ config IR_SUNXI
           To compile this driver as a module, choose M here: the module will
           be called sunxi-ir.
 
+config IR_SERIAL
+       tristate "Homebrew Serial Port Receiver"
+       depends on RC_CORE
+       ---help---
+          Say Y if you want to use Homebrew Serial Port Receivers and
+          Transceivers.
+
+          To compile this driver as a module, choose M here: the module will
+          be called serial-ir.
+
+config IR_SERIAL_TRANSMITTER
+       bool "Serial Port Transmitter"
+       default y
+       depends on IR_SERIAL
+       ---help---
+          Serial Port Transmitter support
+
 endif #RC_DEVICES

diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 379a5c0..3a984ee 100644 (file)
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -37,3 +37,4 @@ obj-$(CONFIG_IR_TTUSBIR) += ttusbir.o
 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

diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/media/rc/serial_ir.c
similarity index 99%
rename from drivers/staging/media/lirc/lirc_serial.c
rename to drivers/media/rc/serial_ir.c
index 9691ba4..ba83b20 100644 (file)
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/media/rc/serial_ir.c
@@ -1,7 +1,7 @@
 /*
- * lirc_serial.c
+ * serial_ir.c
  *
- * lirc_serial - Device driver that records pulse- and pause-lengths
+ * serial_ir - Device driver that records pulse- and pause-lengths
  *            (space-lengths) between DDCD event on a serial port.
  *
  * Copyright (C) 1996,97 Ralph Metzler <rjkm@thp.uni-koeln.de>

diff --git a/drivers/staging/media/lirc/Kconfig b/drivers/staging/media/lirc/Kconfig
index 6879c46..25b7e7c 100644 (file)
--- a/drivers/staging/media/lirc/Kconfig
+++ b/drivers/staging/media/lirc/Kconfig
@@ -38,19 +38,6 @@ config LIRC_SASEM
        help
          Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module
 
-config LIRC_SERIAL
-       tristate "Homebrew Serial Port Receiver"
-       depends on LIRC
-       help
-         Driver for Homebrew Serial Port Receivers
-
-config LIRC_SERIAL_TRANSMITTER
-       bool "Serial Port Transmitter"
-       default y
-       depends on LIRC_SERIAL
-       help
-         Serial Port Transmitter support
-
 config LIRC_SIR
        tristate "Built-in SIR IrDA port"
        depends on LIRC

diff --git a/drivers/staging/media/lirc/Makefile b/drivers/staging/media/lirc/Makefile
index 5430adf..7f919ea 100644 (file)
--- a/drivers/staging/media/lirc/Makefile
+++ b/drivers/staging/media/lirc/Makefile
@@ -7,6 +7,5 @@ obj-$(CONFIG_LIRC_BT829)        += lirc_bt829.o
 obj-$(CONFIG_LIRC_IMON)                += lirc_imon.o
 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_ZILOG)       += lirc_zilog.o