staging: comedi: move out of staging directory
Subsystems (2)
Greg Kroah-Hartman
maintainerPATCH 1/1 staging: comedi: move out of staging directory
The comedi code came into the kernel back in 2008, but traces its lifetime to much much earlier. It's been polished and buffed and there's really nothing preventing it from being part of the "real" portion of the kernel.
So move it to drivers/comedi/ as it belongs there.
Many thanks to the hundreds of developers who did the work to make this happen.
Cc Ian Abbott <[email protected]>
Cc H Hartley Sweeten <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
MAINTAINERS | 12 ++++++------
drivers/Kconfig | 2 ++
drivers/Makefile | 1 +
drivers/{staging => }/comedi/Kconfig | 0
drivers/{staging => }/comedi/Makefile | 0
drivers/{staging => }/comedi/TODO | 0
drivers/{staging => }/comedi/comedi.h | 0
drivers/{staging => }/comedi/comedi_buf.c | 0
drivers/{staging => }/comedi/comedi_fops.c | 0
drivers/{staging => }/comedi/comedi_internal.h | 0
drivers/{staging => }/comedi/comedi_pci.c | 0
drivers/{staging => }/comedi/comedi_pci.h | 0
drivers/{staging => }/comedi/comedi_pcmcia.c | 0
drivers/{staging => }/comedi/comedi_pcmcia.h | 0
drivers/{staging => }/comedi/comedi_usb.c | 0
drivers/{staging => }/comedi/comedi_usb.h | 0
drivers/{staging => }/comedi/comedidev.h | 0
drivers/{staging => }/comedi/comedilib.h | 0
drivers/{staging => }/comedi/drivers.c | 0
drivers/{staging => }/comedi/drivers/8255.c | 0
drivers/{staging => }/comedi/drivers/8255.h | 0
drivers/{staging => }/comedi/drivers/8255_pci.c | 0
drivers/{staging => }/comedi/drivers/Makefile | 0
.../{staging => }/comedi/drivers/addi_apci_1032.c | 0
.../{staging => }/comedi/drivers/addi_apci_1500.c | 0
.../{staging => }/comedi/drivers/addi_apci_1516.c | 0
.../{staging => }/comedi/drivers/addi_apci_1564.c | 0
.../{staging => }/comedi/drivers/addi_apci_16xx.c | 0
.../{staging => }/comedi/drivers/addi_apci_2032.c | 0
.../{staging => }/comedi/drivers/addi_apci_2200.c | 0
.../{staging => }/comedi/drivers/addi_apci_3120.c | 0
.../{staging => }/comedi/drivers/addi_apci_3501.c | 0
.../{staging => }/comedi/drivers/addi_apci_3xxx.c | 0
drivers/{staging => }/comedi/drivers/addi_tcw.h | 0
drivers/{staging => }/comedi/drivers/addi_watchdog.c | 0
drivers/{staging => }/comedi/drivers/addi_watchdog.h | 0
drivers/{staging => }/comedi/drivers/adl_pci6208.c | 0
drivers/{staging => }/comedi/drivers/adl_pci7x3x.c | 0
drivers/{staging => }/comedi/drivers/adl_pci8164.c | 0
drivers/{staging => }/comedi/drivers/adl_pci9111.c | 0
drivers/{staging => }/comedi/drivers/adl_pci9118.c | 0
drivers/{staging => }/comedi/drivers/adq12b.c | 0
drivers/{staging => }/comedi/drivers/adv_pci1710.c | 0
drivers/{staging => }/comedi/drivers/adv_pci1720.c | 0
drivers/{staging => }/comedi/drivers/adv_pci1723.c | 0
drivers/{staging => }/comedi/drivers/adv_pci1724.c | 0
drivers/{staging => }/comedi/drivers/adv_pci1760.c | 0
drivers/{staging => }/comedi/drivers/adv_pci_dio.c | 0
drivers/{staging => }/comedi/drivers/aio_aio12_8.c | 0
drivers/{staging => }/comedi/drivers/aio_iiro_16.c | 0
drivers/{staging => }/comedi/drivers/amcc_s5933.h | 0
drivers/{staging => }/comedi/drivers/amplc_dio200.c | 0
drivers/{staging => }/comedi/drivers/amplc_dio200.h | 0
.../comedi/drivers/amplc_dio200_common.c | 0
.../{staging => }/comedi/drivers/amplc_dio200_pci.c | 0
drivers/{staging => }/comedi/drivers/amplc_pc236.c | 0
drivers/{staging => }/comedi/drivers/amplc_pc236.h | 0
.../comedi/drivers/amplc_pc236_common.c | 0
drivers/{staging => }/comedi/drivers/amplc_pc263.c | 0
drivers/{staging => }/comedi/drivers/amplc_pci224.c | 0
drivers/{staging => }/comedi/drivers/amplc_pci230.c | 0
drivers/{staging => }/comedi/drivers/amplc_pci236.c | 0
drivers/{staging => }/comedi/drivers/amplc_pci263.c | 0
drivers/{staging => }/comedi/drivers/c6xdigio.c | 0
drivers/{staging => }/comedi/drivers/cb_das16_cs.c | 0
drivers/{staging => }/comedi/drivers/cb_pcidas.c | 0
drivers/{staging => }/comedi/drivers/cb_pcidas64.c | 0
drivers/{staging => }/comedi/drivers/cb_pcidda.c | 0
drivers/{staging => }/comedi/drivers/cb_pcimdas.c | 0
drivers/{staging => }/comedi/drivers/cb_pcimdda.c | 0
drivers/{staging => }/comedi/drivers/comedi_8254.c | 0
drivers/{staging => }/comedi/drivers/comedi_8254.h | 0
drivers/{staging => }/comedi/drivers/comedi_8255.c | 0
drivers/{staging => }/comedi/drivers/comedi_bond.c | 0
drivers/{staging => }/comedi/drivers/comedi_isadma.c | 0
drivers/{staging => }/comedi/drivers/comedi_isadma.h | 0
.../{staging => }/comedi/drivers/comedi_parport.c | 0
drivers/{staging => }/comedi/drivers/comedi_test.c | 0
.../{staging => }/comedi/drivers/contec_pci_dio.c | 0
drivers/{staging => }/comedi/drivers/dac02.c | 0
drivers/{staging => }/comedi/drivers/daqboard2000.c | 0
drivers/{staging => }/comedi/drivers/das08.c | 0
drivers/{staging => }/comedi/drivers/das08.h | 0
drivers/{staging => }/comedi/drivers/das08_cs.c | 0
drivers/{staging => }/comedi/drivers/das08_isa.c | 0
drivers/{staging => }/comedi/drivers/das08_pci.c | 0
drivers/{staging => }/comedi/drivers/das16.c | 0
drivers/{staging => }/comedi/drivers/das16m1.c | 0
drivers/{staging => }/comedi/drivers/das1800.c | 0
drivers/{staging => }/comedi/drivers/das6402.c | 0
drivers/{staging => }/comedi/drivers/das800.c | 0
drivers/{staging => }/comedi/drivers/dmm32at.c | 0
drivers/{staging => }/comedi/drivers/dt2801.c | 0
drivers/{staging => }/comedi/drivers/dt2811.c | 0
drivers/{staging => }/comedi/drivers/dt2814.c | 0
drivers/{staging => }/comedi/drivers/dt2815.c | 0
drivers/{staging => }/comedi/drivers/dt2817.c | 0
drivers/{staging => }/comedi/drivers/dt282x.c | 0
drivers/{staging => }/comedi/drivers/dt3000.c | 0
drivers/{staging => }/comedi/drivers/dt9812.c | 0
drivers/{staging => }/comedi/drivers/dyna_pci10xx.c | 0
drivers/{staging => }/comedi/drivers/fl512.c | 0
drivers/{staging => }/comedi/drivers/gsc_hpdi.c | 0
drivers/{staging => }/comedi/drivers/icp_multi.c | 0
drivers/{staging => }/comedi/drivers/ii_pci20kc.c | 0
drivers/{staging => }/comedi/drivers/jr3_pci.c | 0
drivers/{staging => }/comedi/drivers/jr3_pci.h | 0
drivers/{staging => }/comedi/drivers/ke_counter.c | 0
drivers/{staging => }/comedi/drivers/me4000.c | 0
drivers/{staging => }/comedi/drivers/me_daq.c | 0
drivers/{staging => }/comedi/drivers/mf6x4.c | 0
drivers/{staging => }/comedi/drivers/mite.c | 0
drivers/{staging => }/comedi/drivers/mite.h | 0
drivers/{staging => }/comedi/drivers/mpc624.c | 0
drivers/{staging => }/comedi/drivers/multiq3.c | 0
drivers/{staging => }/comedi/drivers/ni_6527.c | 0
drivers/{staging => }/comedi/drivers/ni_65xx.c | 0
drivers/{staging => }/comedi/drivers/ni_660x.c | 0
drivers/{staging => }/comedi/drivers/ni_670x.c | 0
drivers/{staging => }/comedi/drivers/ni_at_a2150.c | 0
drivers/{staging => }/comedi/drivers/ni_at_ao.c | 0
drivers/{staging => }/comedi/drivers/ni_atmio.c | 0
drivers/{staging => }/comedi/drivers/ni_atmio16d.c | 0
drivers/{staging => }/comedi/drivers/ni_daq_700.c | 0
drivers/{staging => }/comedi/drivers/ni_daq_dio24.c | 0
drivers/{staging => }/comedi/drivers/ni_labpc.c | 0
drivers/{staging => }/comedi/drivers/ni_labpc.h | 0
.../{staging => }/comedi/drivers/ni_labpc_common.c | 0
drivers/{staging => }/comedi/drivers/ni_labpc_cs.c | 0
.../{staging => }/comedi/drivers/ni_labpc_isadma.c | 0
.../{staging => }/comedi/drivers/ni_labpc_isadma.h | 0
drivers/{staging => }/comedi/drivers/ni_labpc_pci.c | 0
drivers/{staging => }/comedi/drivers/ni_labpc_regs.h | 0
drivers/{staging => }/comedi/drivers/ni_mio_common.c | 0
drivers/{staging => }/comedi/drivers/ni_mio_cs.c | 0
drivers/{staging => }/comedi/drivers/ni_pcidio.c | 0
drivers/{staging => }/comedi/drivers/ni_pcimio.c | 0
drivers/{staging => }/comedi/drivers/ni_routes.c | 0
drivers/{staging => }/comedi/drivers/ni_routes.h | 0
.../{staging => }/comedi/drivers/ni_routing/README | 0
.../comedi/drivers/ni_routing/ni_device_routes.c | 0
.../comedi/drivers/ni_routing/ni_device_routes.h | 0
.../comedi/drivers/ni_routing/ni_device_routes/all.h | 0
.../drivers/ni_routing/ni_device_routes/pci-6070e.c | 0
.../drivers/ni_routing/ni_device_routes/pci-6220.c | 0
.../drivers/ni_routing/ni_device_routes/pci-6221.c | 0
.../drivers/ni_routing/ni_device_routes/pci-6229.c | 0
.../drivers/ni_routing/ni_device_routes/pci-6251.c | 0
.../drivers/ni_routing/ni_device_routes/pci-6254.c | 0
.../drivers/ni_routing/ni_device_routes/pci-6259.c | 0
.../drivers/ni_routing/ni_device_routes/pci-6534.c | 0
.../drivers/ni_routing/ni_device_routes/pci-6602.c | 0
.../drivers/ni_routing/ni_device_routes/pci-6713.c | 0
.../drivers/ni_routing/ni_device_routes/pci-6723.c | 0
.../drivers/ni_routing/ni_device_routes/pci-6733.c | 0
.../drivers/ni_routing/ni_device_routes/pxi-6030e.c | 0
.../drivers/ni_routing/ni_device_routes/pxi-6224.c | 0
.../drivers/ni_routing/ni_device_routes/pxi-6225.c | 0
.../drivers/ni_routing/ni_device_routes/pxi-6251.c | 0
.../drivers/ni_routing/ni_device_routes/pxi-6733.c | 0
.../drivers/ni_routing/ni_device_routes/pxie-6251.c | 0
.../drivers/ni_routing/ni_device_routes/pxie-6535.c | 0
.../drivers/ni_routing/ni_device_routes/pxie-6738.c | 0
.../comedi/drivers/ni_routing/ni_route_values.c | 0
.../comedi/drivers/ni_routing/ni_route_values.h | 0
.../comedi/drivers/ni_routing/ni_route_values/all.h | 0
.../drivers/ni_routing/ni_route_values/ni_660x.c | 0
.../drivers/ni_routing/ni_route_values/ni_eseries.c | 0
.../drivers/ni_routing/ni_route_values/ni_mseries.c | 0
.../comedi/drivers/ni_routing/tools/.gitignore | 0
.../comedi/drivers/ni_routing/tools/Makefile | 0
.../drivers/ni_routing/tools/convert_c_to_py.c | 0
.../drivers/ni_routing/tools/convert_csv_to_c.py | 0
.../drivers/ni_routing/tools/convert_py_to_csv.py | 0
.../drivers/ni_routing/tools/csv_collection.py | 0
.../drivers/ni_routing/tools/make_blank_csv.py | 0
.../comedi/drivers/ni_routing/tools/ni_names.py | 0
drivers/{staging => }/comedi/drivers/ni_stc.h | 0
drivers/{staging => }/comedi/drivers/ni_tio.c | 0
drivers/{staging => }/comedi/drivers/ni_tio.h | 0
.../{staging => }/comedi/drivers/ni_tio_internal.h | 0
drivers/{staging => }/comedi/drivers/ni_tiocmd.c | 0
drivers/{staging => }/comedi/drivers/ni_usb6501.c | 0
drivers/{staging => }/comedi/drivers/pcl711.c | 0
drivers/{staging => }/comedi/drivers/pcl724.c | 0
drivers/{staging => }/comedi/drivers/pcl726.c | 0
drivers/{staging => }/comedi/drivers/pcl730.c | 0
drivers/{staging => }/comedi/drivers/pcl812.c | 0
drivers/{staging => }/comedi/drivers/pcl816.c | 0
drivers/{staging => }/comedi/drivers/pcl818.c | 0
drivers/{staging => }/comedi/drivers/pcm3724.c | 0
drivers/{staging => }/comedi/drivers/pcmad.c | 0
drivers/{staging => }/comedi/drivers/pcmda12.c | 0
drivers/{staging => }/comedi/drivers/pcmmio.c | 0
drivers/{staging => }/comedi/drivers/pcmuio.c | 0
drivers/{staging => }/comedi/drivers/plx9052.h | 0
drivers/{staging => }/comedi/drivers/plx9080.h | 0
.../{staging => }/comedi/drivers/quatech_daqp_cs.c | 0
drivers/{staging => }/comedi/drivers/rtd520.c | 0
drivers/{staging => }/comedi/drivers/rti800.c | 0
drivers/{staging => }/comedi/drivers/rti802.c | 0
drivers/{staging => }/comedi/drivers/s526.c | 0
drivers/{staging => }/comedi/drivers/s626.c | 0
drivers/{staging => }/comedi/drivers/s626.h | 0
drivers/{staging => }/comedi/drivers/ssv_dnp.c | 0
drivers/{staging => }/comedi/drivers/tests/Makefile | 0
.../comedi/drivers/tests/comedi_example_test.c | 0
.../comedi/drivers/tests/ni_routes_test.c | 0
.../{staging => }/comedi/drivers/tests/unittest.h | 0
drivers/{staging => }/comedi/drivers/usbdux.c | 0
drivers/{staging => }/comedi/drivers/usbduxfast.c | 0
drivers/{staging => }/comedi/drivers/usbduxsigma.c | 0
drivers/{staging => }/comedi/drivers/vmk80xx.c | 0
drivers/{staging => }/comedi/drivers/z8536.h | 0
drivers/{staging => }/comedi/kcomedilib/Makefile | 0
.../comedi/kcomedilib/kcomedilib_main.c | 0
drivers/{staging => }/comedi/proc.c | 0
drivers/{staging => }/comedi/range.c | 0
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
220 files changed, 9 insertions(+), 9 deletions(-)
rename drivers/{staging => }/comedi/Kconfig (100%)
rename drivers/{staging => }/comedi/Makefile (100%)
rename drivers/{staging => }/comedi/TODO (100%)
rename drivers/{staging => }/comedi/comedi.h (100%)
rename drivers/{staging => }/comedi/comedi_buf.c (100%)
rename drivers/{staging => }/comedi/comedi_fops.c (100%)
rename drivers/{staging => }/comedi/comedi_internal.h (100%)
rename drivers/{staging => }/comedi/comedi_pci.c (100%)
rename drivers/{staging => }/comedi/comedi_pci.h (100%)
rename drivers/{staging => }/comedi/comedi_pcmcia.c (100%)
rename drivers/{staging => }/comedi/comedi_pcmcia.h (100%)
rename drivers/{staging => }/comedi/comedi_usb.c (100%)
rename drivers/{staging => }/comedi/comedi_usb.h (100%)
rename drivers/{staging => }/comedi/comedidev.h (100%)
rename drivers/{staging => }/comedi/comedilib.h (100%)
rename drivers/{staging => }/comedi/drivers.c (100%)
rename drivers/{staging => }/comedi/drivers/8255.c (100%)
rename drivers/{staging => }/comedi/drivers/8255.h (100%)
rename drivers/{staging => }/comedi/drivers/8255_pci.c (100%)
rename drivers/{staging => }/comedi/drivers/Makefile (100%)
rename drivers/{staging => }/comedi/drivers/addi_apci_1032.c (100%)
rename drivers/{staging => }/comedi/drivers/addi_apci_1500.c (100%)
rename drivers/{staging => }/comedi/drivers/addi_apci_1516.c (100%)
rename drivers/{staging => }/comedi/drivers/addi_apci_1564.c (100%)
rename drivers/{staging => }/comedi/drivers/addi_apci_16xx.c (100%)
rename drivers/{staging => }/comedi/drivers/addi_apci_2032.c (100%)
rename drivers/{staging => }/comedi/drivers/addi_apci_2200.c (100%)
rename drivers/{staging => }/comedi/drivers/addi_apci_3120.c (100%)
rename drivers/{staging => }/comedi/drivers/addi_apci_3501.c (100%)
rename drivers/{staging => }/comedi/drivers/addi_apci_3xxx.c (100%)
rename drivers/{staging => }/comedi/drivers/addi_tcw.h (100%)
rename drivers/{staging => }/comedi/drivers/addi_watchdog.c (100%)
rename drivers/{staging => }/comedi/drivers/addi_watchdog.h (100%)
rename drivers/{staging => }/comedi/drivers/adl_pci6208.c (100%)
rename drivers/{staging => }/comedi/drivers/adl_pci7x3x.c (100%)
rename drivers/{staging => }/comedi/drivers/adl_pci8164.c (100%)
rename drivers/{staging => }/comedi/drivers/adl_pci9111.c (100%)
rename drivers/{staging => }/comedi/drivers/adl_pci9118.c (100%)
rename drivers/{staging => }/comedi/drivers/adq12b.c (100%)
rename drivers/{staging => }/comedi/drivers/adv_pci1710.c (100%)
rename drivers/{staging => }/comedi/drivers/adv_pci1720.c (100%)
rename drivers/{staging => }/comedi/drivers/adv_pci1723.c (100%)
rename drivers/{staging => }/comedi/drivers/adv_pci1724.c (100%)
rename drivers/{staging => }/comedi/drivers/adv_pci1760.c (100%)
rename drivers/{staging => }/comedi/drivers/adv_pci_dio.c (100%)
rename drivers/{staging => }/comedi/drivers/aio_aio12_8.c (100%)
rename drivers/{staging => }/comedi/drivers/aio_iiro_16.c (100%)
rename drivers/{staging => }/comedi/drivers/amcc_s5933.h (100%)
rename drivers/{staging => }/comedi/drivers/amplc_dio200.c (100%)
rename drivers/{staging => }/comedi/drivers/amplc_dio200.h (100%)
rename drivers/{staging => }/comedi/drivers/amplc_dio200_common.c (100%)
rename drivers/{staging => }/comedi/drivers/amplc_dio200_pci.c (100%)
rename drivers/{staging => }/comedi/drivers/amplc_pc236.c (100%)
rename drivers/{staging => }/comedi/drivers/amplc_pc236.h (100%)
rename drivers/{staging => }/comedi/drivers/amplc_pc236_common.c (100%)
rename drivers/{staging => }/comedi/drivers/amplc_pc263.c (100%)
rename drivers/{staging => }/comedi/drivers/amplc_pci224.c (100%)
rename drivers/{staging => }/comedi/drivers/amplc_pci230.c (100%)
rename drivers/{staging => }/comedi/drivers/amplc_pci236.c (100%)
rename drivers/{staging => }/comedi/drivers/amplc_pci263.c (100%)
rename drivers/{staging => }/comedi/drivers/c6xdigio.c (100%)
rename drivers/{staging => }/comedi/drivers/cb_das16_cs.c (100%)
rename drivers/{staging => }/comedi/drivers/cb_pcidas.c (100%)
rename drivers/{staging => }/comedi/drivers/cb_pcidas64.c (100%)
rename drivers/{staging => }/comedi/drivers/cb_pcidda.c (100%)
rename drivers/{staging => }/comedi/drivers/cb_pcimdas.c (100%)
rename drivers/{staging => }/comedi/drivers/cb_pcimdda.c (100%)
rename drivers/{staging => }/comedi/drivers/comedi_8254.c (100%)
rename drivers/{staging => }/comedi/drivers/comedi_8254.h (100%)
rename drivers/{staging => }/comedi/drivers/comedi_8255.c (100%)
rename drivers/{staging => }/comedi/drivers/comedi_bond.c (100%)
rename drivers/{staging => }/comedi/drivers/comedi_isadma.c (100%)
rename drivers/{staging => }/comedi/drivers/comedi_isadma.h (100%)
rename drivers/{staging => }/comedi/drivers/comedi_parport.c (100%)
rename drivers/{staging => }/comedi/drivers/comedi_test.c (100%)
rename drivers/{staging => }/comedi/drivers/contec_pci_dio.c (100%)
rename drivers/{staging => }/comedi/drivers/dac02.c (100%)
rename drivers/{staging => }/comedi/drivers/daqboard2000.c (100%)
rename drivers/{staging => }/comedi/drivers/das08.c (100%)
rename drivers/{staging => }/comedi/drivers/das08.h (100%)
rename drivers/{staging => }/comedi/drivers/das08_cs.c (100%)
rename drivers/{staging => }/comedi/drivers/das08_isa.c (100%)
rename drivers/{staging => }/comedi/drivers/das08_pci.c (100%)
rename drivers/{staging => }/comedi/drivers/das16.c (100%)
rename drivers/{staging => }/comedi/drivers/das16m1.c (100%)
rename drivers/{staging => }/comedi/drivers/das1800.c (100%)
rename drivers/{staging => }/comedi/drivers/das6402.c (100%)
rename drivers/{staging => }/comedi/drivers/das800.c (100%)
rename drivers/{staging => }/comedi/drivers/dmm32at.c (100%)
rename drivers/{staging => }/comedi/drivers/dt2801.c (100%)
rename drivers/{staging => }/comedi/drivers/dt2811.c (100%)
rename drivers/{staging => }/comedi/drivers/dt2814.c (100%)
rename drivers/{staging => }/comedi/drivers/dt2815.c (100%)
rename drivers/{staging => }/comedi/drivers/dt2817.c (100%)
rename drivers/{staging => }/comedi/drivers/dt282x.c (100%)
rename drivers/{staging => }/comedi/drivers/dt3000.c (100%)
rename drivers/{staging => }/comedi/drivers/dt9812.c (100%)
rename drivers/{staging => }/comedi/drivers/dyna_pci10xx.c (100%)
rename drivers/{staging => }/comedi/drivers/fl512.c (100%)
rename drivers/{staging => }/comedi/drivers/gsc_hpdi.c (100%)
rename drivers/{staging => }/comedi/drivers/icp_multi.c (100%)
rename drivers/{staging => }/comedi/drivers/ii_pci20kc.c (100%)
rename drivers/{staging => }/comedi/drivers/jr3_pci.c (100%)
rename drivers/{staging => }/comedi/drivers/jr3_pci.h (100%)
rename drivers/{staging => }/comedi/drivers/ke_counter.c (100%)
rename drivers/{staging => }/comedi/drivers/me4000.c (100%)
rename drivers/{staging => }/comedi/drivers/me_daq.c (100%)
rename drivers/{staging => }/comedi/drivers/mf6x4.c (100%)
rename drivers/{staging => }/comedi/drivers/mite.c (100%)
rename drivers/{staging => }/comedi/drivers/mite.h (100%)
rename drivers/{staging => }/comedi/drivers/mpc624.c (100%)
rename drivers/{staging => }/comedi/drivers/multiq3.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_6527.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_65xx.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_660x.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_670x.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_at_a2150.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_at_ao.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_atmio.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_atmio16d.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_daq_700.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_daq_dio24.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_labpc.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_labpc.h (100%)
rename drivers/{staging => }/comedi/drivers/ni_labpc_common.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_labpc_cs.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_labpc_isadma.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_labpc_isadma.h (100%)
rename drivers/{staging => }/comedi/drivers/ni_labpc_pci.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_labpc_regs.h (100%)
rename drivers/{staging => }/comedi/drivers/ni_mio_common.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_mio_cs.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_pcidio.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_pcimio.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routes.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routes.h (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/README (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes.h (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/all.h (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pci-6070e.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pci-6220.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pci-6221.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pci-6229.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pci-6251.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pci-6254.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pci-6259.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pci-6534.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pci-6602.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pci-6713.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pci-6723.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pci-6733.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pxi-6030e.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pxi-6224.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pxi-6225.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pxi-6251.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pxi-6733.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pxie-6251.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pxie-6535.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_device_routes/pxie-6738.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_route_values.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_route_values.h (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_route_values/all.h (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_route_values/ni_660x.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_route_values/ni_eseries.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/ni_route_values/ni_mseries.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/tools/.gitignore (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/tools/Makefile (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/tools/convert_c_to_py.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/tools/convert_csv_to_c.py (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/tools/convert_py_to_csv.py (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/tools/csv_collection.py (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/tools/make_blank_csv.py (100%)
rename drivers/{staging => }/comedi/drivers/ni_routing/tools/ni_names.py (100%)
rename drivers/{staging => }/comedi/drivers/ni_stc.h (100%)
rename drivers/{staging => }/comedi/drivers/ni_tio.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_tio.h (100%)
rename drivers/{staging => }/comedi/drivers/ni_tio_internal.h (100%)
rename drivers/{staging => }/comedi/drivers/ni_tiocmd.c (100%)
rename drivers/{staging => }/comedi/drivers/ni_usb6501.c (100%)
rename drivers/{staging => }/comedi/drivers/pcl711.c (100%)
rename drivers/{staging => }/comedi/drivers/pcl724.c (100%)
rename drivers/{staging => }/comedi/drivers/pcl726.c (100%)
rename drivers/{staging => }/comedi/drivers/pcl730.c (100%)
rename drivers/{staging => }/comedi/drivers/pcl812.c (100%)
rename drivers/{staging => }/comedi/drivers/pcl816.c (100%)
rename drivers/{staging => }/comedi/drivers/pcl818.c (100%)
rename drivers/{staging => }/comedi/drivers/pcm3724.c (100%)
rename drivers/{staging => }/comedi/drivers/pcmad.c (100%)
rename drivers/{staging => }/comedi/drivers/pcmda12.c (100%)
rename drivers/{staging => }/comedi/drivers/pcmmio.c (100%)
rename drivers/{staging => }/comedi/drivers/pcmuio.c (100%)
rename drivers/{staging => }/comedi/drivers/plx9052.h (100%)
rename drivers/{staging => }/comedi/drivers/plx9080.h (100%)
rename drivers/{staging => }/comedi/drivers/quatech_daqp_cs.c (100%)
rename drivers/{staging => }/comedi/drivers/rtd520.c (100%)
rename drivers/{staging => }/comedi/drivers/rti800.c (100%)
rename drivers/{staging => }/comedi/drivers/rti802.c (100%)
rename drivers/{staging => }/comedi/drivers/s526.c (100%)
rename drivers/{staging => }/comedi/drivers/s626.c (100%)
rename drivers/{staging => }/comedi/drivers/s626.h (100%)
rename drivers/{staging => }/comedi/drivers/ssv_dnp.c (100%)
rename drivers/{staging => }/comedi/drivers/tests/Makefile (100%)
rename drivers/{staging => }/comedi/drivers/tests/comedi_example_test.c (100%)
rename drivers/{staging => }/comedi/drivers/tests/ni_routes_test.c (100%)
rename drivers/{staging => }/comedi/drivers/tests/unittest.h (100%)
rename drivers/{staging => }/comedi/drivers/usbdux.c (100%)
rename drivers/{staging => }/comedi/drivers/usbduxfast.c (100%)
rename drivers/{staging => }/comedi/drivers/usbduxsigma.c (100%)
rename drivers/{staging => }/comedi/drivers/vmk80xx.c (100%)
rename drivers/{staging => }/comedi/drivers/z8536.h (100%)
rename drivers/{staging => }/comedi/kcomedilib/Makefile (100%)
rename drivers/{staging => }/comedi/kcomedilib/kcomedilib_main.c (100%)
rename drivers/{staging => }/comedi/proc.c (100%)
rename drivers/{staging => }/comedi/range.c (100%)MAINTAINERS +6 -6
@@ -4419,6 +4419,12 @@ S: Supported F: Documentation/process/code-of-conduct-interpretation.rst F: Documentation/process/code-of-conduct.rst +COMEDI DRIVERS +M: Ian Abbott <[email protected]> +M: H Hartley Sweeten <[email protected]> +S: Odd Fixes +F: drivers/comedi/ + COMMON CLK FRAMEWORK M: Michael Turquette <[email protected]> M: Stephen Boyd <[email protected]>
@@ -16969,12 +16975,6 @@ L: [email protected] S: Maintained F: drivers/staging/media/atomisp/ -STAGING - COMEDI -M: Ian Abbott <[email protected]> -M: H Hartley Sweeten <[email protected]> -S: Odd Fixes -F: drivers/staging/comedi/ - STAGING - FIELDBUS SUBSYSTEM M: Sven Van Asbroeck <[email protected]> S: Maintained
drivers/Kconfig +2 -0
@@ -149,6 +149,8 @@ source "drivers/xen/Kconfig" source "drivers/greybus/Kconfig" +source "drivers/comedi/Kconfig" + source "drivers/staging/Kconfig" source "drivers/platform/Kconfig"
drivers/Makefile +1 -0
@@ -148,6 +148,7 @@ obj-$(CONFIG_VHOST_IOTLB) += vhost/ obj-$(CONFIG_VHOST) += vhost/ obj-$(CONFIG_VLYNQ) += vlynq/ obj-$(CONFIG_GREYBUS) += greybus/ +obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_STAGING) += staging/ obj-y += platform/
drivers/comedi/Kconfig renamed from drivers/staging/comedi/Kconfig +0 -0
drivers/comedi/Makefile renamed from drivers/staging/comedi/Makefile +0 -0
drivers/comedi/TODO renamed from drivers/staging/comedi/TODO +0 -0
drivers/comedi/comedi.h renamed from drivers/staging/comedi/comedi.h +0 -0
drivers/comedi/comedi_buf.c renamed from drivers/staging/comedi/comedi_buf.c +0 -0
drivers/comedi/comedi_fops.c renamed from drivers/staging/comedi/comedi_fops.c +0 -0
drivers/comedi/comedi_internal.h renamed from drivers/staging/comedi/comedi_internal.h +0 -0
drivers/comedi/comedi_pci.c renamed from drivers/staging/comedi/comedi_pci.c +0 -0
drivers/comedi/comedi_pci.h renamed from drivers/staging/comedi/comedi_pci.h +0 -0
drivers/comedi/comedi_pcmcia.c renamed from drivers/staging/comedi/comedi_pcmcia.c +0 -0
drivers/comedi/comedi_pcmcia.h renamed from drivers/staging/comedi/comedi_pcmcia.h +0 -0
drivers/comedi/comedi_usb.c renamed from drivers/staging/comedi/comedi_usb.c +0 -0
drivers/comedi/comedi_usb.h renamed from drivers/staging/comedi/comedi_usb.h +0 -0
drivers/comedi/comedidev.h renamed from drivers/staging/comedi/comedidev.h +0 -0
drivers/comedi/comedilib.h renamed from drivers/staging/comedi/comedilib.h +0 -0
drivers/comedi/drivers.c renamed from drivers/staging/comedi/drivers.c +0 -0
drivers/comedi/drivers/8255.c renamed from drivers/staging/comedi/drivers/8255.c +0 -0
drivers/comedi/drivers/8255.h renamed from drivers/staging/comedi/drivers/8255.h +0 -0
drivers/comedi/drivers/8255_pci.c renamed from drivers/staging/comedi/drivers/8255_pci.c +0 -0
drivers/comedi/drivers/Makefile renamed from drivers/staging/comedi/drivers/Makefile +0 -0
drivers/comedi/drivers/addi_apci_1032.c renamed from drivers/staging/comedi/drivers/addi_apci_1032.c +0 -0
drivers/comedi/drivers/addi_apci_1500.c renamed from drivers/staging/comedi/drivers/addi_apci_1500.c +0 -0
drivers/comedi/drivers/addi_apci_1516.c renamed from drivers/staging/comedi/drivers/addi_apci_1516.c +0 -0
drivers/comedi/drivers/addi_apci_1564.c renamed from drivers/staging/comedi/drivers/addi_apci_1564.c +0 -0
drivers/comedi/drivers/addi_apci_16xx.c renamed from drivers/staging/comedi/drivers/addi_apci_16xx.c +0 -0
drivers/comedi/drivers/addi_apci_2032.c renamed from drivers/staging/comedi/drivers/addi_apci_2032.c +0 -0
drivers/comedi/drivers/addi_apci_2200.c renamed from drivers/staging/comedi/drivers/addi_apci_2200.c +0 -0
drivers/comedi/drivers/addi_apci_3120.c renamed from drivers/staging/comedi/drivers/addi_apci_3120.c +0 -0
drivers/comedi/drivers/addi_apci_3501.c renamed from drivers/staging/comedi/drivers/addi_apci_3501.c +0 -0
drivers/comedi/drivers/addi_apci_3xxx.c renamed from drivers/staging/comedi/drivers/addi_apci_3xxx.c +0 -0
drivers/comedi/drivers/addi_tcw.h renamed from drivers/staging/comedi/drivers/addi_tcw.h +0 -0
drivers/comedi/drivers/addi_watchdog.c renamed from drivers/staging/comedi/drivers/addi_watchdog.c +0 -0
drivers/comedi/drivers/addi_watchdog.h renamed from drivers/staging/comedi/drivers/addi_watchdog.h +0 -0
drivers/comedi/drivers/adl_pci6208.c renamed from drivers/staging/comedi/drivers/adl_pci6208.c +0 -0
drivers/comedi/drivers/adl_pci7x3x.c renamed from drivers/staging/comedi/drivers/adl_pci7x3x.c +0 -0
drivers/comedi/drivers/adl_pci8164.c renamed from drivers/staging/comedi/drivers/adl_pci8164.c +0 -0
drivers/comedi/drivers/adl_pci9111.c renamed from drivers/staging/comedi/drivers/adl_pci9111.c +0 -0
drivers/comedi/drivers/adl_pci9118.c renamed from drivers/staging/comedi/drivers/adl_pci9118.c +0 -0
drivers/comedi/drivers/adq12b.c renamed from drivers/staging/comedi/drivers/adq12b.c +0 -0
drivers/comedi/drivers/adv_pci1710.c renamed from drivers/staging/comedi/drivers/adv_pci1710.c +0 -0
drivers/comedi/drivers/adv_pci1720.c renamed from drivers/staging/comedi/drivers/adv_pci1720.c +0 -0
drivers/comedi/drivers/adv_pci1723.c renamed from drivers/staging/comedi/drivers/adv_pci1723.c +0 -0
drivers/comedi/drivers/adv_pci1724.c renamed from drivers/staging/comedi/drivers/adv_pci1724.c +0 -0
drivers/comedi/drivers/adv_pci1760.c renamed from drivers/staging/comedi/drivers/adv_pci1760.c +0 -0
drivers/comedi/drivers/adv_pci_dio.c renamed from drivers/staging/comedi/drivers/adv_pci_dio.c +0 -0
drivers/comedi/drivers/aio_aio12_8.c renamed from drivers/staging/comedi/drivers/aio_aio12_8.c +0 -0
drivers/comedi/drivers/aio_iiro_16.c renamed from drivers/staging/comedi/drivers/aio_iiro_16.c +0 -0
drivers/comedi/drivers/amcc_s5933.h renamed from drivers/staging/comedi/drivers/amcc_s5933.h +0 -0
drivers/comedi/drivers/amplc_dio200.c renamed from drivers/staging/comedi/drivers/amplc_dio200.c +0 -0
drivers/comedi/drivers/amplc_dio200.h renamed from drivers/staging/comedi/drivers/amplc_dio200.h +0 -0
drivers/comedi/drivers/amplc_dio200_common.c renamed from drivers/staging/comedi/drivers/amplc_dio200_common.c +0 -0
drivers/comedi/drivers/amplc_dio200_pci.c renamed from drivers/staging/comedi/drivers/amplc_dio200_pci.c +0 -0
drivers/comedi/drivers/amplc_pc236.c renamed from drivers/staging/comedi/drivers/amplc_pc236.c +0 -0
drivers/comedi/drivers/amplc_pc236.h renamed from drivers/staging/comedi/drivers/amplc_pc236.h +0 -0
drivers/comedi/drivers/amplc_pc236_common.c renamed from drivers/staging/comedi/drivers/amplc_pc236_common.c +0 -0
drivers/comedi/drivers/amplc_pc263.c renamed from drivers/staging/comedi/drivers/amplc_pc263.c +0 -0
drivers/comedi/drivers/amplc_pci224.c renamed from drivers/staging/comedi/drivers/amplc_pci224.c +0 -0
drivers/comedi/drivers/amplc_pci230.c renamed from drivers/staging/comedi/drivers/amplc_pci230.c +0 -0
drivers/comedi/drivers/amplc_pci236.c renamed from drivers/staging/comedi/drivers/amplc_pci236.c +0 -0
drivers/comedi/drivers/amplc_pci263.c renamed from drivers/staging/comedi/drivers/amplc_pci263.c +0 -0
drivers/comedi/drivers/c6xdigio.c renamed from drivers/staging/comedi/drivers/c6xdigio.c +0 -0
drivers/comedi/drivers/cb_das16_cs.c renamed from drivers/staging/comedi/drivers/cb_das16_cs.c +0 -0
drivers/comedi/drivers/cb_pcidas.c renamed from drivers/staging/comedi/drivers/cb_pcidas.c +0 -0
drivers/comedi/drivers/cb_pcidas64.c renamed from drivers/staging/comedi/drivers/cb_pcidas64.c +0 -0
drivers/comedi/drivers/cb_pcidda.c renamed from drivers/staging/comedi/drivers/cb_pcidda.c +0 -0
drivers/comedi/drivers/cb_pcimdas.c renamed from drivers/staging/comedi/drivers/cb_pcimdas.c +0 -0
drivers/comedi/drivers/cb_pcimdda.c renamed from drivers/staging/comedi/drivers/cb_pcimdda.c +0 -0
drivers/comedi/drivers/comedi_8254.c renamed from drivers/staging/comedi/drivers/comedi_8254.c +0 -0
drivers/comedi/drivers/comedi_8254.h renamed from drivers/staging/comedi/drivers/comedi_8254.h +0 -0
drivers/comedi/drivers/comedi_8255.c renamed from drivers/staging/comedi/drivers/comedi_8255.c +0 -0
drivers/comedi/drivers/comedi_bond.c renamed from drivers/staging/comedi/drivers/comedi_bond.c +0 -0
drivers/comedi/drivers/comedi_isadma.c renamed from drivers/staging/comedi/drivers/comedi_isadma.c +0 -0
drivers/comedi/drivers/comedi_isadma.h renamed from drivers/staging/comedi/drivers/comedi_isadma.h +0 -0
drivers/comedi/drivers/comedi_parport.c renamed from drivers/staging/comedi/drivers/comedi_parport.c +0 -0
drivers/comedi/drivers/comedi_test.c renamed from drivers/staging/comedi/drivers/comedi_test.c +0 -0
drivers/comedi/drivers/contec_pci_dio.c renamed from drivers/staging/comedi/drivers/contec_pci_dio.c +0 -0
drivers/comedi/drivers/dac02.c renamed from drivers/staging/comedi/drivers/dac02.c +0 -0
drivers/comedi/drivers/daqboard2000.c renamed from drivers/staging/comedi/drivers/daqboard2000.c +0 -0
drivers/comedi/drivers/das08.c renamed from drivers/staging/comedi/drivers/das08.c +0 -0
drivers/comedi/drivers/das08.h renamed from drivers/staging/comedi/drivers/das08.h +0 -0
drivers/comedi/drivers/das08_cs.c renamed from drivers/staging/comedi/drivers/das08_cs.c +0 -0
drivers/comedi/drivers/das08_isa.c renamed from drivers/staging/comedi/drivers/das08_isa.c +0 -0
drivers/comedi/drivers/das08_pci.c renamed from drivers/staging/comedi/drivers/das08_pci.c +0 -0
drivers/comedi/drivers/das16.c renamed from drivers/staging/comedi/drivers/das16.c +0 -0
drivers/comedi/drivers/das16m1.c renamed from drivers/staging/comedi/drivers/das16m1.c +0 -0
drivers/comedi/drivers/das1800.c renamed from drivers/staging/comedi/drivers/das1800.c +0 -0
drivers/comedi/drivers/das6402.c renamed from drivers/staging/comedi/drivers/das6402.c +0 -0
drivers/comedi/drivers/das800.c renamed from drivers/staging/comedi/drivers/das800.c +0 -0
drivers/comedi/drivers/dmm32at.c renamed from drivers/staging/comedi/drivers/dmm32at.c +0 -0
drivers/comedi/drivers/dt2801.c renamed from drivers/staging/comedi/drivers/dt2801.c +0 -0
drivers/comedi/drivers/dt2811.c renamed from drivers/staging/comedi/drivers/dt2811.c +0 -0
drivers/comedi/drivers/dt2814.c renamed from drivers/staging/comedi/drivers/dt2814.c +0 -0
drivers/comedi/drivers/dt2815.c renamed from drivers/staging/comedi/drivers/dt2815.c +0 -0
drivers/comedi/drivers/dt2817.c renamed from drivers/staging/comedi/drivers/dt2817.c +0 -0
drivers/comedi/drivers/dt282x.c renamed from drivers/staging/comedi/drivers/dt282x.c +0 -0
drivers/comedi/drivers/dt3000.c renamed from drivers/staging/comedi/drivers/dt3000.c +0 -0
drivers/comedi/drivers/dt9812.c renamed from drivers/staging/comedi/drivers/dt9812.c +0 -0
drivers/comedi/drivers/dyna_pci10xx.c renamed from drivers/staging/comedi/drivers/dyna_pci10xx.c +0 -0
drivers/comedi/drivers/fl512.c renamed from drivers/staging/comedi/drivers/fl512.c +0 -0
drivers/comedi/drivers/gsc_hpdi.c renamed from drivers/staging/comedi/drivers/gsc_hpdi.c +0 -0
drivers/comedi/drivers/icp_multi.c renamed from drivers/staging/comedi/drivers/icp_multi.c +0 -0
drivers/comedi/drivers/ii_pci20kc.c renamed from drivers/staging/comedi/drivers/ii_pci20kc.c +0 -0
drivers/comedi/drivers/jr3_pci.c renamed from drivers/staging/comedi/drivers/jr3_pci.c +0 -0
drivers/comedi/drivers/jr3_pci.h renamed from drivers/staging/comedi/drivers/jr3_pci.h +0 -0
drivers/comedi/drivers/ke_counter.c renamed from drivers/staging/comedi/drivers/ke_counter.c +0 -0
drivers/comedi/drivers/me4000.c renamed from drivers/staging/comedi/drivers/me4000.c +0 -0
drivers/comedi/drivers/me_daq.c renamed from drivers/staging/comedi/drivers/me_daq.c +0 -0
drivers/comedi/drivers/mf6x4.c renamed from drivers/staging/comedi/drivers/mf6x4.c +0 -0
drivers/comedi/drivers/mite.c renamed from drivers/staging/comedi/drivers/mite.c +0 -0
drivers/comedi/drivers/mite.h renamed from drivers/staging/comedi/drivers/mite.h +0 -0
drivers/comedi/drivers/mpc624.c renamed from drivers/staging/comedi/drivers/mpc624.c +0 -0
drivers/comedi/drivers/multiq3.c renamed from drivers/staging/comedi/drivers/multiq3.c +0 -0
drivers/comedi/drivers/ni_6527.c renamed from drivers/staging/comedi/drivers/ni_6527.c +0 -0
drivers/comedi/drivers/ni_65xx.c renamed from drivers/staging/comedi/drivers/ni_65xx.c +0 -0
drivers/comedi/drivers/ni_660x.c renamed from drivers/staging/comedi/drivers/ni_660x.c +0 -0
drivers/comedi/drivers/ni_670x.c renamed from drivers/staging/comedi/drivers/ni_670x.c +0 -0
drivers/comedi/drivers/ni_at_a2150.c renamed from drivers/staging/comedi/drivers/ni_at_a2150.c +0 -0
drivers/comedi/drivers/ni_at_ao.c renamed from drivers/staging/comedi/drivers/ni_at_ao.c +0 -0
drivers/comedi/drivers/ni_atmio.c renamed from drivers/staging/comedi/drivers/ni_atmio.c +0 -0
drivers/comedi/drivers/ni_atmio16d.c renamed from drivers/staging/comedi/drivers/ni_atmio16d.c +0 -0
drivers/comedi/drivers/ni_daq_700.c renamed from drivers/staging/comedi/drivers/ni_daq_700.c +0 -0
drivers/comedi/drivers/ni_daq_dio24.c renamed from drivers/staging/comedi/drivers/ni_daq_dio24.c +0 -0
drivers/comedi/drivers/ni_labpc.c renamed from drivers/staging/comedi/drivers/ni_labpc.c +0 -0
drivers/comedi/drivers/ni_labpc.h renamed from drivers/staging/comedi/drivers/ni_labpc.h +0 -0
drivers/comedi/drivers/ni_labpc_common.c renamed from drivers/staging/comedi/drivers/ni_labpc_common.c +0 -0
drivers/comedi/drivers/ni_labpc_cs.c renamed from drivers/staging/comedi/drivers/ni_labpc_cs.c +0 -0
drivers/comedi/drivers/ni_labpc_isadma.c renamed from drivers/staging/comedi/drivers/ni_labpc_isadma.c +0 -0
drivers/comedi/drivers/ni_labpc_isadma.h renamed from drivers/staging/comedi/drivers/ni_labpc_isadma.h +0 -0
drivers/comedi/drivers/ni_labpc_pci.c renamed from drivers/staging/comedi/drivers/ni_labpc_pci.c +0 -0
drivers/comedi/drivers/ni_labpc_regs.h renamed from drivers/staging/comedi/drivers/ni_labpc_regs.h +0 -0
drivers/comedi/drivers/ni_mio_common.c renamed from drivers/staging/comedi/drivers/ni_mio_common.c +0 -0
drivers/comedi/drivers/ni_mio_cs.c renamed from drivers/staging/comedi/drivers/ni_mio_cs.c +0 -0
drivers/comedi/drivers/ni_pcidio.c renamed from drivers/staging/comedi/drivers/ni_pcidio.c +0 -0
drivers/comedi/drivers/ni_pcimio.c renamed from drivers/staging/comedi/drivers/ni_pcimio.c +0 -0
drivers/comedi/drivers/ni_routes.c renamed from drivers/staging/comedi/drivers/ni_routes.c +0 -0
drivers/comedi/drivers/ni_routes.h renamed from drivers/staging/comedi/drivers/ni_routes.h +0 -0
drivers/comedi/drivers/ni_routing/README renamed from drivers/staging/comedi/drivers/ni_routing/README +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes.h renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes.h +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/all.h renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/all.h +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6070e.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6070e.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6220.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6220.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6221.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6221.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6229.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6229.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6251.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6251.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6254.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6254.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6259.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6259.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6534.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6534.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6602.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6602.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6713.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6713.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6723.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6723.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6733.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6733.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6030e.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxi-6030e.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6224.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxi-6224.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6225.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxi-6225.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6251.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxi-6251.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6733.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxi-6733.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6251.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxie-6251.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6535.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxie-6535.c +0 -0
drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6738.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxie-6738.c +0 -0
drivers/comedi/drivers/ni_routing/ni_route_values.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_route_values.c +0 -0
drivers/comedi/drivers/ni_routing/ni_route_values.h renamed from drivers/staging/comedi/drivers/ni_routing/ni_route_values.h +0 -0
drivers/comedi/drivers/ni_routing/ni_route_values/all.h renamed from drivers/staging/comedi/drivers/ni_routing/ni_route_values/all.h +0 -0
drivers/comedi/drivers/ni_routing/ni_route_values/ni_660x.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_route_values/ni_660x.c +0 -0
drivers/comedi/drivers/ni_routing/ni_route_values/ni_eseries.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_route_values/ni_eseries.c +0 -0
drivers/comedi/drivers/ni_routing/ni_route_values/ni_mseries.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_route_values/ni_mseries.c +0 -0
drivers/comedi/drivers/ni_routing/tools/.gitignore renamed from drivers/staging/comedi/drivers/ni_routing/tools/.gitignore +0 -0
drivers/comedi/drivers/ni_routing/tools/Makefile renamed from drivers/staging/comedi/drivers/ni_routing/tools/Makefile +0 -0
drivers/comedi/drivers/ni_routing/tools/convert_c_to_py.c renamed from drivers/staging/comedi/drivers/ni_routing/tools/convert_c_to_py.c +0 -0
drivers/comedi/drivers/ni_routing/tools/convert_csv_to_c.py renamed from drivers/staging/comedi/drivers/ni_routing/tools/convert_csv_to_c.py +0 -0
drivers/comedi/drivers/ni_routing/tools/convert_py_to_csv.py renamed from drivers/staging/comedi/drivers/ni_routing/tools/convert_py_to_csv.py +0 -0
drivers/comedi/drivers/ni_routing/tools/csv_collection.py renamed from drivers/staging/comedi/drivers/ni_routing/tools/csv_collection.py +0 -0
drivers/comedi/drivers/ni_routing/tools/make_blank_csv.py renamed from drivers/staging/comedi/drivers/ni_routing/tools/make_blank_csv.py +0 -0
drivers/comedi/drivers/ni_routing/tools/ni_names.py renamed from drivers/staging/comedi/drivers/ni_routing/tools/ni_names.py +0 -0
drivers/comedi/drivers/ni_stc.h renamed from drivers/staging/comedi/drivers/ni_stc.h +0 -0
drivers/comedi/drivers/ni_tio.c renamed from drivers/staging/comedi/drivers/ni_tio.c +0 -0
drivers/comedi/drivers/ni_tio.h renamed from drivers/staging/comedi/drivers/ni_tio.h +0 -0
drivers/comedi/drivers/ni_tio_internal.h renamed from drivers/staging/comedi/drivers/ni_tio_internal.h +0 -0
drivers/comedi/drivers/ni_tiocmd.c renamed from drivers/staging/comedi/drivers/ni_tiocmd.c +0 -0
drivers/comedi/drivers/ni_usb6501.c renamed from drivers/staging/comedi/drivers/ni_usb6501.c +0 -0
drivers/comedi/drivers/pcl711.c renamed from drivers/staging/comedi/drivers/pcl711.c +0 -0
drivers/comedi/drivers/pcl724.c renamed from drivers/staging/comedi/drivers/pcl724.c +0 -0
drivers/comedi/drivers/pcl726.c renamed from drivers/staging/comedi/drivers/pcl726.c +0 -0
drivers/comedi/drivers/pcl730.c renamed from drivers/staging/comedi/drivers/pcl730.c +0 -0
drivers/comedi/drivers/pcl812.c renamed from drivers/staging/comedi/drivers/pcl812.c +0 -0
drivers/comedi/drivers/pcl816.c renamed from drivers/staging/comedi/drivers/pcl816.c +0 -0
drivers/comedi/drivers/pcl818.c renamed from drivers/staging/comedi/drivers/pcl818.c +0 -0
drivers/comedi/drivers/pcm3724.c renamed from drivers/staging/comedi/drivers/pcm3724.c +0 -0
drivers/comedi/drivers/pcmad.c renamed from drivers/staging/comedi/drivers/pcmad.c +0 -0
drivers/comedi/drivers/pcmda12.c renamed from drivers/staging/comedi/drivers/pcmda12.c +0 -0
drivers/comedi/drivers/pcmmio.c renamed from drivers/staging/comedi/drivers/pcmmio.c +0 -0
drivers/comedi/drivers/pcmuio.c renamed from drivers/staging/comedi/drivers/pcmuio.c +0 -0
drivers/comedi/drivers/plx9052.h renamed from drivers/staging/comedi/drivers/plx9052.h +0 -0
drivers/comedi/drivers/plx9080.h renamed from drivers/staging/comedi/drivers/plx9080.h +0 -0
drivers/comedi/drivers/quatech_daqp_cs.c renamed from drivers/staging/comedi/drivers/quatech_daqp_cs.c +0 -0
drivers/comedi/drivers/rtd520.c renamed from drivers/staging/comedi/drivers/rtd520.c +0 -0
drivers/comedi/drivers/rti800.c renamed from drivers/staging/comedi/drivers/rti800.c +0 -0
drivers/comedi/drivers/rti802.c renamed from drivers/staging/comedi/drivers/rti802.c +0 -0
drivers/comedi/drivers/s526.c renamed from drivers/staging/comedi/drivers/s526.c +0 -0
drivers/comedi/drivers/s626.c renamed from drivers/staging/comedi/drivers/s626.c +0 -0
drivers/comedi/drivers/s626.h renamed from drivers/staging/comedi/drivers/s626.h +0 -0
drivers/comedi/drivers/ssv_dnp.c renamed from drivers/staging/comedi/drivers/ssv_dnp.c +0 -0
drivers/comedi/drivers/tests/Makefile renamed from drivers/staging/comedi/drivers/tests/Makefile +0 -0
drivers/comedi/drivers/tests/comedi_example_test.c renamed from drivers/staging/comedi/drivers/tests/comedi_example_test.c +0 -0
drivers/comedi/drivers/tests/ni_routes_test.c renamed from drivers/staging/comedi/drivers/tests/ni_routes_test.c +0 -0
drivers/comedi/drivers/tests/unittest.h renamed from drivers/staging/comedi/drivers/tests/unittest.h +0 -0
drivers/comedi/drivers/usbdux.c renamed from drivers/staging/comedi/drivers/usbdux.c +0 -0
drivers/comedi/drivers/usbduxfast.c renamed from drivers/staging/comedi/drivers/usbduxfast.c +0 -0
drivers/comedi/drivers/usbduxsigma.c renamed from drivers/staging/comedi/drivers/usbduxsigma.c +0 -0
drivers/comedi/drivers/vmk80xx.c renamed from drivers/staging/comedi/drivers/vmk80xx.c +0 -0
drivers/comedi/drivers/z8536.h renamed from drivers/staging/comedi/drivers/z8536.h +0 -0
drivers/comedi/kcomedilib/Makefile renamed from drivers/staging/comedi/kcomedilib/Makefile +0 -0
drivers/comedi/kcomedilib/kcomedilib_main.c renamed from drivers/staging/comedi/kcomedilib/kcomedilib_main.c +0 -0
drivers/comedi/proc.c renamed from drivers/staging/comedi/proc.c +0 -0
drivers/comedi/range.c renamed from drivers/staging/comedi/range.c +0 -0
drivers/staging/Kconfig +0 -2
@@ -26,8 +26,6 @@ if STAGING source "drivers/staging/wlan-ng/Kconfig" -source "drivers/staging/comedi/Kconfig" - source "drivers/staging/olpc_dcon/Kconfig" source "drivers/staging/rtl8192u/Kconfig"
drivers/staging/Makefile +0 -1
@@ -3,7 +3,6 @@ obj-y += media/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ -obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/ obj-$(CONFIG_RTL8192U) += rtl8192u/ obj-$(CONFIG_RTL8192E) += rtl8192e/
Signature · 1 line
2.31.1