From: Sean Young <sean@mess.org>
To: linux-media@vger.kernel.org
Subject: [PATCH 7/8] [media] rc: promote lirc_sir out of staging
Date: Sat, 25 Mar 2017 12:02:25 +0000 [thread overview]
Message-ID: <bfac2cfec97b87fe57b95e0f7b4b6ea68f2c5b58.1490443026.git.sean@mess.org> (raw)
In-Reply-To: <cover.1490443026.git.sean@mess.org>
In-Reply-To: <cover.1490443026.git.sean@mess.org>
Rename lirc_sir to sir_ir in the process.
Signed-off-by: Sean Young <sean@mess.org>
---
drivers/media/rc/Kconfig | 9 +++++++++
drivers/media/rc/Makefile | 1 +
drivers/{staging/media/lirc/lirc_sir.c => media/rc/sir_ir.c} | 0
drivers/staging/media/lirc/Kconfig | 6 ------
drivers/staging/media/lirc/Makefile | 1 -
5 files changed, 10 insertions(+), 7 deletions(-)
rename drivers/{staging/media/lirc/lirc_sir.c => media/rc/sir_ir.c} (100%)
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index d1d3fd0..f12840f 100644
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -419,6 +419,15 @@ config IR_SERIAL
To compile this driver as a module, choose M here: the module will
be called serial-ir.
+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.
+
config IR_SERIAL_TRANSMITTER
bool "Serial Port Transmitter"
default y
diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 679aa0a..245e2c2 100644
--- 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 bc67da2..e020651 100644
--- 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 28740c9..70f2237 100644
--- 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
--
2.9.3
next prev parent reply other threads:[~2017-03-25 12:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-25 12:02 [PATCH 0/8] Lirc staging cleanup Sean Young
2017-03-25 12:02 ` [PATCH 1/8] [media] staging: sir: fill in missing fields and fix probe Sean Young
2017-03-25 12:02 ` [PATCH 2/8] [media] staging: sir: remove unselectable Tekram and Actisys Sean Young
2017-03-25 12:02 ` [PATCH 3/8] [media] staging: sir: fix checkpatch strict warnings Sean Young
2017-03-25 12:02 ` [PATCH 4/8] [media] staging: sir: use usleep_range() rather than busy looping Sean Young
2017-03-25 12:02 ` [PATCH 5/8] [media] staging: sir: remove unnecessary messages Sean Young
2017-03-25 12:02 ` [PATCH 6/8] [media] staging: sir: make sure we are ready to receive interrupts Sean Young
2017-03-25 12:02 ` Sean Young [this message]
2017-03-25 12:02 ` [PATCH 8/8] [media] staging: lirc_sasem: remove Sean Young
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bfac2cfec97b87fe57b95e0f7b4b6ea68f2c5b58.1490443026.git.sean@mess.org \
--to=sean@mess.org \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).