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.

Jarod Wilson committed 16 years ago

Commit 2c1101d1 parent 8e9e6065 files · +13 −7Browse files

Unified · Split

5 files

@@ -103,3 +103,15 @@ config IR_MCEUSB · 102 unmodified lines
103		103
104	To compile this driver as a module, choose M here: the	104	To compile this driver as a module, choose M here: the
105	module will be called mceusb.	105	module will be called mceusb.
		106
		107	config IR_STREAMZAP
		108	tristate "Streamzap PC Remote IR Receiver"
		109	depends on USB_ARCH_HAS_HCD
		110	depends on IR_CORE
		111	select USB
		112	---help---
		113	Say Y here if you want to use a Streamzap PC Remote
		114	Infrared Receiver.
		115
		116	To compile this driver as a module, choose M here: the
		117	module will be called streamzap.

@@ -16,3 +16,4 @@ obj-$(CONFIG_IR_LIRC_CODEC) += ir-lirc-codec.o · 15 unmodified lines
16	# stand-alone IR receivers/transmitters	16	# stand-alone IR receivers/transmitters
17	obj-$(CONFIG_IR_IMON) += imon.o	17	obj-$(CONFIG_IR_IMON) += imon.o
18	obj-$(CONFIG_IR_MCEUSB) += mceusb.o	18	obj-$(CONFIG_IR_MCEUSB) += mceusb.o
		19	obj-$(CONFIG_IR_STREAMZAP) += streamzap.o

drivers/media/IR/streamzap.crenamed from drivers/staging/lirc/lirc_streamzap.c+0−0

File renamed without changes.

 	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

@@ -14,6 +14,5 @@ obj-$(CONFIG_LIRC_PARALLEL) += lirc_parallel.o · 13 unmodified lines
14	obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o	14	obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o
15	obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o	15	obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o
16	obj-$(CONFIG_LIRC_SIR) += lirc_sir.o	16	obj-$(CONFIG_LIRC_SIR) += lirc_sir.o
17	obj-$(CONFIG_LIRC_STREAMZAP) += lirc_streamzap.o
18	obj-$(CONFIG_LIRC_TTUSBIR) += lirc_ttusbir.o	17	obj-$(CONFIG_LIRC_TTUSBIR) += lirc_ttusbir.o
19	obj-$(CONFIG_LIRC_ZILOG) += lirc_zilog.o	18	obj-$(CONFIG_LIRC_ZILOG) += lirc_zilog.o