Moves drivers/staging/lirc/lirc_streamzap.c to drivers/media/IR/streamzap.c, along with making the requisite Kconfig and Makefile changes.
Unified · Split
| @@ -103,3 +103,15 @@ config IR_MCEUSB · 102 unmodified lines | ||
| 103 | 103 | |
| 104 | 104 | To compile this driver as a module, choose M here: the |
| 105 | 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 | 16 | # stand-alone IR receivers/transmitters |
| 17 | 17 | obj-$(CONFIG_IR_IMON) += imon.o |
| 18 | 18 | obj-$(CONFIG_IR_MCEUSB) += mceusb.o |
| 19 | +obj-$(CONFIG_IR_STREAMZAP) += streamzap.o | |
File renamed without changes.
| @@ -90,12 +90,6 @@ config LIRC_SIR · 89 unmodified lines | ||
| 90 | 90 | help |
| 91 | 91 | Driver for the SIR IrDA port |
| 92 | 92 | |
| 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 | − | |
| 99 | 93 | config LIRC_TTUSBIR |
| 100 | 94 | tristate "Technotrend USB IR Receiver" |
| 101 | 95 | depends on LIRC_STAGING && USB |
| @@ -14,6 +14,5 @@ obj-$(CONFIG_LIRC_PARALLEL) += lirc_parallel.o · 13 unmodified lines | ||
| 14 | 14 | obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o |
| 15 | 15 | obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o |
| 16 | 16 | obj-$(CONFIG_LIRC_SIR) += lirc_sir.o |
| 17 | −obj-$(CONFIG_LIRC_STREAMZAP) += lirc_streamzap.o | |
| 18 | 17 | obj-$(CONFIG_LIRC_TTUSBIR) += lirc_ttusbir.o |
| 19 | 18 | obj-$(CONFIG_LIRC_ZILOG) += lirc_zilog.o |