History

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
  1. drivers/media/IR/Kconfig +12 −0
  2. drivers/media/IR/Makefile +1 −0
  3. drivers/media/IR/streamzap.c +0 −0
  4. drivers/staging/lirc/Kconfig +0 −6
  5. drivers/staging/lirc/Makefile +0 −1
drivers/media/IR/Kconfig+12−0
@@ -103,3 +103,15 @@ config IR_MCEUSB · 102 unmodified lines
103103
104104 To compile this driver as a module, choose M here: the
105105 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.
drivers/media/IR/Makefile+1−0
@@ -16,3 +16,4 @@ obj-$(CONFIG_IR_LIRC_CODEC) += ir-lirc-codec.o · 15 unmodified lines
1616 # stand-alone IR receivers/transmitters
1717 obj-$(CONFIG_IR_IMON) += imon.o
1818 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.

drivers/staging/lirc/Kconfig+0−6
@@ -90,12 +90,6 @@ config LIRC_SIR · 89 unmodified lines
9090 help
9191 Driver for the SIR IrDA port
9292
93−config LIRC_STREAMZAP
94− tristate "Streamzap PC Receiver"
95− depends on LIRC_STAGING && USB
96− help
97− Driver for the Streamzap PC Receiver
98−
9993 config LIRC_TTUSBIR
10094 tristate "Technotrend USB IR Receiver"
10195 depends on LIRC_STAGING && USB
drivers/staging/lirc/Makefile+0−1
@@ -14,6 +14,5 @@ obj-$(CONFIG_LIRC_PARALLEL) += lirc_parallel.o · 13 unmodified lines
1414 obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o
1515 obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o
1616 obj-$(CONFIG_LIRC_SIR) += lirc_sir.o
17−obj-$(CONFIG_LIRC_STREAMZAP) += lirc_streamzap.o
1817 obj-$(CONFIG_LIRC_TTUSBIR) += lirc_ttusbir.o
1918 obj-$(CONFIG_LIRC_ZILOG) += lirc_zilog.o