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: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

5 files changed, 13 insertions, 7 deletions

diff --git a/drivers/media/IR/Kconfig b/drivers/media/IR/Kconfig
index 999a8250b3ce..4094490106a6 100644
--- a/drivers/media/IR/Kconfig
+++ b/drivers/media/IR/Kconfig
@@ -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.
diff --git a/drivers/media/IR/Makefile b/drivers/media/IR/Makefile
index 2ae4f3abfdbd..2566fb4f356e 100644
--- a/drivers/media/IR/Makefile
+++ b/drivers/media/IR/Makefile
@@ -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
diff --git a/drivers/staging/lirc/lirc_streamzap.c b/drivers/media/IR/streamzap.c
index 058e29fd478c..058e29fd478c 100644
--- a/drivers/staging/lirc/lirc_streamzap.c
+++ b/drivers/media/IR/streamzap.c
diff --git a/drivers/staging/lirc/Kconfig b/drivers/staging/lirc/Kconfig
index ab30a098efcc..7db8cb68ab5d 100644
--- a/drivers/staging/lirc/Kconfig
+++ b/drivers/staging/lirc/Kconfig
@@ -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
diff --git a/drivers/staging/lirc/Makefile b/drivers/staging/lirc/Makefile
index a019182a7a38..bd789d8a0177 100644
--- a/drivers/staging/lirc/Makefile
+++ b/drivers/staging/lirc/Makefile
@@ -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