Skip to contentSkip to conversation

staging: comedi: move out of staging directory

PATCH New Greg Kroah-Hartman 1 participant 1 message Apr 14, 2021

Subsystems (2)
lore
Share & tools
lore

Greg Kroah-Hartman

author maintainer
#0 lore raw

PATCH 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]>
---
 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
index 250390c4233d..7ea89f5f4886 100644
@@ -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
index 62c753a73651..47980c6b1945 100644
@@ -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
index 6fba7daba591..8f3fee8281ad 100644
@@ -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
similarity index 100%
rename from drivers/staging/comedi/Kconfig
rename to drivers/comedi/Kconfig
drivers/comedi/Makefile renamed from drivers/staging/comedi/Makefile +0 -0
similarity index 100%
rename from drivers/staging/comedi/Makefile
rename to drivers/comedi/Makefile
drivers/comedi/TODO renamed from drivers/staging/comedi/TODO +0 -0
similarity index 100%
rename from drivers/staging/comedi/TODO
rename to drivers/comedi/TODO
drivers/comedi/comedi.h renamed from drivers/staging/comedi/comedi.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/comedi.h
rename to drivers/comedi/comedi.h
drivers/comedi/comedi_buf.c renamed from drivers/staging/comedi/comedi_buf.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/comedi_buf.c
rename to drivers/comedi/comedi_buf.c
drivers/comedi/comedi_fops.c renamed from drivers/staging/comedi/comedi_fops.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/comedi_fops.c
rename to drivers/comedi/comedi_fops.c
drivers/comedi/comedi_internal.h renamed from drivers/staging/comedi/comedi_internal.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/comedi_internal.h
rename to drivers/comedi/comedi_internal.h
drivers/comedi/comedi_pci.c renamed from drivers/staging/comedi/comedi_pci.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/comedi_pci.c
rename to drivers/comedi/comedi_pci.c
drivers/comedi/comedi_pci.h renamed from drivers/staging/comedi/comedi_pci.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/comedi_pci.h
rename to drivers/comedi/comedi_pci.h
drivers/comedi/comedi_pcmcia.c renamed from drivers/staging/comedi/comedi_pcmcia.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/comedi_pcmcia.c
rename to drivers/comedi/comedi_pcmcia.c
drivers/comedi/comedi_pcmcia.h renamed from drivers/staging/comedi/comedi_pcmcia.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/comedi_pcmcia.h
rename to drivers/comedi/comedi_pcmcia.h
drivers/comedi/comedi_usb.c renamed from drivers/staging/comedi/comedi_usb.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/comedi_usb.c
rename to drivers/comedi/comedi_usb.c
drivers/comedi/comedi_usb.h renamed from drivers/staging/comedi/comedi_usb.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/comedi_usb.h
rename to drivers/comedi/comedi_usb.h
drivers/comedi/comedidev.h renamed from drivers/staging/comedi/comedidev.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/comedidev.h
rename to drivers/comedi/comedidev.h
drivers/comedi/comedilib.h renamed from drivers/staging/comedi/comedilib.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/comedilib.h
rename to drivers/comedi/comedilib.h
drivers/comedi/drivers.c renamed from drivers/staging/comedi/drivers.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers.c
rename to drivers/comedi/drivers.c
drivers/comedi/drivers/8255.c renamed from drivers/staging/comedi/drivers/8255.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/8255.c
rename to drivers/comedi/drivers/8255.c
drivers/comedi/drivers/8255.h renamed from drivers/staging/comedi/drivers/8255.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/8255.h
rename to drivers/comedi/drivers/8255.h
drivers/comedi/drivers/8255_pci.c renamed from drivers/staging/comedi/drivers/8255_pci.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/8255_pci.c
rename to drivers/comedi/drivers/8255_pci.c
drivers/comedi/drivers/Makefile renamed from drivers/staging/comedi/drivers/Makefile +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/Makefile
rename to drivers/comedi/drivers/Makefile
drivers/comedi/drivers/addi_apci_1032.c renamed from drivers/staging/comedi/drivers/addi_apci_1032.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/addi_apci_1032.c
rename to drivers/comedi/drivers/addi_apci_1032.c
drivers/comedi/drivers/addi_apci_1500.c renamed from drivers/staging/comedi/drivers/addi_apci_1500.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/addi_apci_1500.c
rename to drivers/comedi/drivers/addi_apci_1500.c
drivers/comedi/drivers/addi_apci_1516.c renamed from drivers/staging/comedi/drivers/addi_apci_1516.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/addi_apci_1516.c
rename to drivers/comedi/drivers/addi_apci_1516.c
drivers/comedi/drivers/addi_apci_1564.c renamed from drivers/staging/comedi/drivers/addi_apci_1564.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/addi_apci_1564.c
rename to drivers/comedi/drivers/addi_apci_1564.c
drivers/comedi/drivers/addi_apci_16xx.c renamed from drivers/staging/comedi/drivers/addi_apci_16xx.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/addi_apci_16xx.c
rename to drivers/comedi/drivers/addi_apci_16xx.c
drivers/comedi/drivers/addi_apci_2032.c renamed from drivers/staging/comedi/drivers/addi_apci_2032.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/addi_apci_2032.c
rename to drivers/comedi/drivers/addi_apci_2032.c
drivers/comedi/drivers/addi_apci_2200.c renamed from drivers/staging/comedi/drivers/addi_apci_2200.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/addi_apci_2200.c
rename to drivers/comedi/drivers/addi_apci_2200.c
drivers/comedi/drivers/addi_apci_3120.c renamed from drivers/staging/comedi/drivers/addi_apci_3120.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/addi_apci_3120.c
rename to drivers/comedi/drivers/addi_apci_3120.c
drivers/comedi/drivers/addi_apci_3501.c renamed from drivers/staging/comedi/drivers/addi_apci_3501.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/addi_apci_3501.c
rename to drivers/comedi/drivers/addi_apci_3501.c
drivers/comedi/drivers/addi_apci_3xxx.c renamed from drivers/staging/comedi/drivers/addi_apci_3xxx.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/addi_apci_3xxx.c
rename to drivers/comedi/drivers/addi_apci_3xxx.c
drivers/comedi/drivers/addi_tcw.h renamed from drivers/staging/comedi/drivers/addi_tcw.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/addi_tcw.h
rename to drivers/comedi/drivers/addi_tcw.h
drivers/comedi/drivers/addi_watchdog.c renamed from drivers/staging/comedi/drivers/addi_watchdog.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/addi_watchdog.c
rename to drivers/comedi/drivers/addi_watchdog.c
drivers/comedi/drivers/addi_watchdog.h renamed from drivers/staging/comedi/drivers/addi_watchdog.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/addi_watchdog.h
rename to drivers/comedi/drivers/addi_watchdog.h
drivers/comedi/drivers/adl_pci6208.c renamed from drivers/staging/comedi/drivers/adl_pci6208.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/adl_pci6208.c
rename to drivers/comedi/drivers/adl_pci6208.c
drivers/comedi/drivers/adl_pci7x3x.c renamed from drivers/staging/comedi/drivers/adl_pci7x3x.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/adl_pci7x3x.c
rename to drivers/comedi/drivers/adl_pci7x3x.c
drivers/comedi/drivers/adl_pci8164.c renamed from drivers/staging/comedi/drivers/adl_pci8164.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/adl_pci8164.c
rename to drivers/comedi/drivers/adl_pci8164.c
drivers/comedi/drivers/adl_pci9111.c renamed from drivers/staging/comedi/drivers/adl_pci9111.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/adl_pci9111.c
rename to drivers/comedi/drivers/adl_pci9111.c
drivers/comedi/drivers/adl_pci9118.c renamed from drivers/staging/comedi/drivers/adl_pci9118.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/adl_pci9118.c
rename to drivers/comedi/drivers/adl_pci9118.c
drivers/comedi/drivers/adq12b.c renamed from drivers/staging/comedi/drivers/adq12b.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/adq12b.c
rename to drivers/comedi/drivers/adq12b.c
drivers/comedi/drivers/adv_pci1710.c renamed from drivers/staging/comedi/drivers/adv_pci1710.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/adv_pci1710.c
rename to drivers/comedi/drivers/adv_pci1710.c
drivers/comedi/drivers/adv_pci1720.c renamed from drivers/staging/comedi/drivers/adv_pci1720.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/adv_pci1720.c
rename to drivers/comedi/drivers/adv_pci1720.c
drivers/comedi/drivers/adv_pci1723.c renamed from drivers/staging/comedi/drivers/adv_pci1723.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/adv_pci1723.c
rename to drivers/comedi/drivers/adv_pci1723.c
drivers/comedi/drivers/adv_pci1724.c renamed from drivers/staging/comedi/drivers/adv_pci1724.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/adv_pci1724.c
rename to drivers/comedi/drivers/adv_pci1724.c
drivers/comedi/drivers/adv_pci1760.c renamed from drivers/staging/comedi/drivers/adv_pci1760.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/adv_pci1760.c
rename to drivers/comedi/drivers/adv_pci1760.c
drivers/comedi/drivers/adv_pci_dio.c renamed from drivers/staging/comedi/drivers/adv_pci_dio.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/adv_pci_dio.c
rename to drivers/comedi/drivers/adv_pci_dio.c
drivers/comedi/drivers/aio_aio12_8.c renamed from drivers/staging/comedi/drivers/aio_aio12_8.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/aio_aio12_8.c
rename to drivers/comedi/drivers/aio_aio12_8.c
drivers/comedi/drivers/aio_iiro_16.c renamed from drivers/staging/comedi/drivers/aio_iiro_16.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/aio_iiro_16.c
rename to drivers/comedi/drivers/aio_iiro_16.c
drivers/comedi/drivers/amcc_s5933.h renamed from drivers/staging/comedi/drivers/amcc_s5933.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/amcc_s5933.h
rename to drivers/comedi/drivers/amcc_s5933.h
drivers/comedi/drivers/amplc_dio200.c renamed from drivers/staging/comedi/drivers/amplc_dio200.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/amplc_dio200.c
rename to drivers/comedi/drivers/amplc_dio200.c
drivers/comedi/drivers/amplc_dio200.h renamed from drivers/staging/comedi/drivers/amplc_dio200.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/amplc_dio200.h
rename to drivers/comedi/drivers/amplc_dio200.h
drivers/comedi/drivers/amplc_dio200_common.c renamed from drivers/staging/comedi/drivers/amplc_dio200_common.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/amplc_dio200_common.c
rename to drivers/comedi/drivers/amplc_dio200_common.c
drivers/comedi/drivers/amplc_dio200_pci.c renamed from drivers/staging/comedi/drivers/amplc_dio200_pci.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/amplc_dio200_pci.c
rename to drivers/comedi/drivers/amplc_dio200_pci.c
drivers/comedi/drivers/amplc_pc236.c renamed from drivers/staging/comedi/drivers/amplc_pc236.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/amplc_pc236.c
rename to drivers/comedi/drivers/amplc_pc236.c
drivers/comedi/drivers/amplc_pc236.h renamed from drivers/staging/comedi/drivers/amplc_pc236.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/amplc_pc236.h
rename to drivers/comedi/drivers/amplc_pc236.h
drivers/comedi/drivers/amplc_pc236_common.c renamed from drivers/staging/comedi/drivers/amplc_pc236_common.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/amplc_pc236_common.c
rename to drivers/comedi/drivers/amplc_pc236_common.c
drivers/comedi/drivers/amplc_pc263.c renamed from drivers/staging/comedi/drivers/amplc_pc263.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/amplc_pc263.c
rename to drivers/comedi/drivers/amplc_pc263.c
drivers/comedi/drivers/amplc_pci224.c renamed from drivers/staging/comedi/drivers/amplc_pci224.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/amplc_pci224.c
rename to drivers/comedi/drivers/amplc_pci224.c
drivers/comedi/drivers/amplc_pci230.c renamed from drivers/staging/comedi/drivers/amplc_pci230.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/amplc_pci230.c
rename to drivers/comedi/drivers/amplc_pci230.c
drivers/comedi/drivers/amplc_pci236.c renamed from drivers/staging/comedi/drivers/amplc_pci236.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/amplc_pci236.c
rename to drivers/comedi/drivers/amplc_pci236.c
drivers/comedi/drivers/amplc_pci263.c renamed from drivers/staging/comedi/drivers/amplc_pci263.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/amplc_pci263.c
rename to drivers/comedi/drivers/amplc_pci263.c
drivers/comedi/drivers/c6xdigio.c renamed from drivers/staging/comedi/drivers/c6xdigio.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/c6xdigio.c
rename to drivers/comedi/drivers/c6xdigio.c
drivers/comedi/drivers/cb_das16_cs.c renamed from drivers/staging/comedi/drivers/cb_das16_cs.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/cb_das16_cs.c
rename to drivers/comedi/drivers/cb_das16_cs.c
drivers/comedi/drivers/cb_pcidas.c renamed from drivers/staging/comedi/drivers/cb_pcidas.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/cb_pcidas.c
rename to drivers/comedi/drivers/cb_pcidas.c
drivers/comedi/drivers/cb_pcidas64.c renamed from drivers/staging/comedi/drivers/cb_pcidas64.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/cb_pcidas64.c
rename to drivers/comedi/drivers/cb_pcidas64.c
drivers/comedi/drivers/cb_pcidda.c renamed from drivers/staging/comedi/drivers/cb_pcidda.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/cb_pcidda.c
rename to drivers/comedi/drivers/cb_pcidda.c
drivers/comedi/drivers/cb_pcimdas.c renamed from drivers/staging/comedi/drivers/cb_pcimdas.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/cb_pcimdas.c
rename to drivers/comedi/drivers/cb_pcimdas.c
drivers/comedi/drivers/cb_pcimdda.c renamed from drivers/staging/comedi/drivers/cb_pcimdda.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/cb_pcimdda.c
rename to drivers/comedi/drivers/cb_pcimdda.c
drivers/comedi/drivers/comedi_8254.c renamed from drivers/staging/comedi/drivers/comedi_8254.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/comedi_8254.c
rename to drivers/comedi/drivers/comedi_8254.c
drivers/comedi/drivers/comedi_8254.h renamed from drivers/staging/comedi/drivers/comedi_8254.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/comedi_8254.h
rename to drivers/comedi/drivers/comedi_8254.h
drivers/comedi/drivers/comedi_8255.c renamed from drivers/staging/comedi/drivers/comedi_8255.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/comedi_8255.c
rename to drivers/comedi/drivers/comedi_8255.c
drivers/comedi/drivers/comedi_bond.c renamed from drivers/staging/comedi/drivers/comedi_bond.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/comedi_bond.c
rename to drivers/comedi/drivers/comedi_bond.c
drivers/comedi/drivers/comedi_isadma.c renamed from drivers/staging/comedi/drivers/comedi_isadma.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/comedi_isadma.c
rename to drivers/comedi/drivers/comedi_isadma.c
drivers/comedi/drivers/comedi_isadma.h renamed from drivers/staging/comedi/drivers/comedi_isadma.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/comedi_isadma.h
rename to drivers/comedi/drivers/comedi_isadma.h
drivers/comedi/drivers/comedi_parport.c renamed from drivers/staging/comedi/drivers/comedi_parport.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/comedi_parport.c
rename to drivers/comedi/drivers/comedi_parport.c
drivers/comedi/drivers/comedi_test.c renamed from drivers/staging/comedi/drivers/comedi_test.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/comedi_test.c
rename to drivers/comedi/drivers/comedi_test.c
drivers/comedi/drivers/contec_pci_dio.c renamed from drivers/staging/comedi/drivers/contec_pci_dio.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/contec_pci_dio.c
rename to drivers/comedi/drivers/contec_pci_dio.c
drivers/comedi/drivers/dac02.c renamed from drivers/staging/comedi/drivers/dac02.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/dac02.c
rename to drivers/comedi/drivers/dac02.c
drivers/comedi/drivers/daqboard2000.c renamed from drivers/staging/comedi/drivers/daqboard2000.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/daqboard2000.c
rename to drivers/comedi/drivers/daqboard2000.c
drivers/comedi/drivers/das08.c renamed from drivers/staging/comedi/drivers/das08.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/das08.c
rename to drivers/comedi/drivers/das08.c
drivers/comedi/drivers/das08.h renamed from drivers/staging/comedi/drivers/das08.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/das08.h
rename to drivers/comedi/drivers/das08.h
drivers/comedi/drivers/das08_cs.c renamed from drivers/staging/comedi/drivers/das08_cs.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/das08_cs.c
rename to drivers/comedi/drivers/das08_cs.c
drivers/comedi/drivers/das08_isa.c renamed from drivers/staging/comedi/drivers/das08_isa.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/das08_isa.c
rename to drivers/comedi/drivers/das08_isa.c
drivers/comedi/drivers/das08_pci.c renamed from drivers/staging/comedi/drivers/das08_pci.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/das08_pci.c
rename to drivers/comedi/drivers/das08_pci.c
drivers/comedi/drivers/das16.c renamed from drivers/staging/comedi/drivers/das16.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/das16.c
rename to drivers/comedi/drivers/das16.c
drivers/comedi/drivers/das16m1.c renamed from drivers/staging/comedi/drivers/das16m1.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/das16m1.c
rename to drivers/comedi/drivers/das16m1.c
drivers/comedi/drivers/das1800.c renamed from drivers/staging/comedi/drivers/das1800.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/das1800.c
rename to drivers/comedi/drivers/das1800.c
drivers/comedi/drivers/das6402.c renamed from drivers/staging/comedi/drivers/das6402.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/das6402.c
rename to drivers/comedi/drivers/das6402.c
drivers/comedi/drivers/das800.c renamed from drivers/staging/comedi/drivers/das800.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/das800.c
rename to drivers/comedi/drivers/das800.c
drivers/comedi/drivers/dmm32at.c renamed from drivers/staging/comedi/drivers/dmm32at.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/dmm32at.c
rename to drivers/comedi/drivers/dmm32at.c
drivers/comedi/drivers/dt2801.c renamed from drivers/staging/comedi/drivers/dt2801.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/dt2801.c
rename to drivers/comedi/drivers/dt2801.c
drivers/comedi/drivers/dt2811.c renamed from drivers/staging/comedi/drivers/dt2811.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/dt2811.c
rename to drivers/comedi/drivers/dt2811.c
drivers/comedi/drivers/dt2814.c renamed from drivers/staging/comedi/drivers/dt2814.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/dt2814.c
rename to drivers/comedi/drivers/dt2814.c
drivers/comedi/drivers/dt2815.c renamed from drivers/staging/comedi/drivers/dt2815.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/dt2815.c
rename to drivers/comedi/drivers/dt2815.c
drivers/comedi/drivers/dt2817.c renamed from drivers/staging/comedi/drivers/dt2817.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/dt2817.c
rename to drivers/comedi/drivers/dt2817.c
drivers/comedi/drivers/dt282x.c renamed from drivers/staging/comedi/drivers/dt282x.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/dt282x.c
rename to drivers/comedi/drivers/dt282x.c
drivers/comedi/drivers/dt3000.c renamed from drivers/staging/comedi/drivers/dt3000.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/dt3000.c
rename to drivers/comedi/drivers/dt3000.c
drivers/comedi/drivers/dt9812.c renamed from drivers/staging/comedi/drivers/dt9812.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/dt9812.c
rename to drivers/comedi/drivers/dt9812.c
drivers/comedi/drivers/dyna_pci10xx.c renamed from drivers/staging/comedi/drivers/dyna_pci10xx.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/dyna_pci10xx.c
rename to drivers/comedi/drivers/dyna_pci10xx.c
drivers/comedi/drivers/fl512.c renamed from drivers/staging/comedi/drivers/fl512.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/fl512.c
rename to drivers/comedi/drivers/fl512.c
drivers/comedi/drivers/gsc_hpdi.c renamed from drivers/staging/comedi/drivers/gsc_hpdi.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/gsc_hpdi.c
rename to drivers/comedi/drivers/gsc_hpdi.c
drivers/comedi/drivers/icp_multi.c renamed from drivers/staging/comedi/drivers/icp_multi.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/icp_multi.c
rename to drivers/comedi/drivers/icp_multi.c
drivers/comedi/drivers/ii_pci20kc.c renamed from drivers/staging/comedi/drivers/ii_pci20kc.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ii_pci20kc.c
rename to drivers/comedi/drivers/ii_pci20kc.c
drivers/comedi/drivers/jr3_pci.c renamed from drivers/staging/comedi/drivers/jr3_pci.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/jr3_pci.c
rename to drivers/comedi/drivers/jr3_pci.c
drivers/comedi/drivers/jr3_pci.h renamed from drivers/staging/comedi/drivers/jr3_pci.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/jr3_pci.h
rename to drivers/comedi/drivers/jr3_pci.h
drivers/comedi/drivers/ke_counter.c renamed from drivers/staging/comedi/drivers/ke_counter.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ke_counter.c
rename to drivers/comedi/drivers/ke_counter.c
drivers/comedi/drivers/me4000.c renamed from drivers/staging/comedi/drivers/me4000.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/me4000.c
rename to drivers/comedi/drivers/me4000.c
drivers/comedi/drivers/me_daq.c renamed from drivers/staging/comedi/drivers/me_daq.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/me_daq.c
rename to drivers/comedi/drivers/me_daq.c
drivers/comedi/drivers/mf6x4.c renamed from drivers/staging/comedi/drivers/mf6x4.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/mf6x4.c
rename to drivers/comedi/drivers/mf6x4.c
drivers/comedi/drivers/mite.c renamed from drivers/staging/comedi/drivers/mite.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/mite.c
rename to drivers/comedi/drivers/mite.c
drivers/comedi/drivers/mite.h renamed from drivers/staging/comedi/drivers/mite.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/mite.h
rename to drivers/comedi/drivers/mite.h
drivers/comedi/drivers/mpc624.c renamed from drivers/staging/comedi/drivers/mpc624.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/mpc624.c
rename to drivers/comedi/drivers/mpc624.c
drivers/comedi/drivers/multiq3.c renamed from drivers/staging/comedi/drivers/multiq3.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/multiq3.c
rename to drivers/comedi/drivers/multiq3.c
drivers/comedi/drivers/ni_6527.c renamed from drivers/staging/comedi/drivers/ni_6527.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_6527.c
rename to drivers/comedi/drivers/ni_6527.c
drivers/comedi/drivers/ni_65xx.c renamed from drivers/staging/comedi/drivers/ni_65xx.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_65xx.c
rename to drivers/comedi/drivers/ni_65xx.c
drivers/comedi/drivers/ni_660x.c renamed from drivers/staging/comedi/drivers/ni_660x.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_660x.c
rename to drivers/comedi/drivers/ni_660x.c
drivers/comedi/drivers/ni_670x.c renamed from drivers/staging/comedi/drivers/ni_670x.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_670x.c
rename to drivers/comedi/drivers/ni_670x.c
drivers/comedi/drivers/ni_at_a2150.c renamed from drivers/staging/comedi/drivers/ni_at_a2150.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_at_a2150.c
rename to drivers/comedi/drivers/ni_at_a2150.c
drivers/comedi/drivers/ni_at_ao.c renamed from drivers/staging/comedi/drivers/ni_at_ao.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_at_ao.c
rename to drivers/comedi/drivers/ni_at_ao.c
drivers/comedi/drivers/ni_atmio.c renamed from drivers/staging/comedi/drivers/ni_atmio.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_atmio.c
rename to drivers/comedi/drivers/ni_atmio.c
drivers/comedi/drivers/ni_atmio16d.c renamed from drivers/staging/comedi/drivers/ni_atmio16d.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_atmio16d.c
rename to drivers/comedi/drivers/ni_atmio16d.c
drivers/comedi/drivers/ni_daq_700.c renamed from drivers/staging/comedi/drivers/ni_daq_700.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_daq_700.c
rename to drivers/comedi/drivers/ni_daq_700.c
drivers/comedi/drivers/ni_daq_dio24.c renamed from drivers/staging/comedi/drivers/ni_daq_dio24.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_daq_dio24.c
rename to drivers/comedi/drivers/ni_daq_dio24.c
drivers/comedi/drivers/ni_labpc.c renamed from drivers/staging/comedi/drivers/ni_labpc.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_labpc.c
rename to drivers/comedi/drivers/ni_labpc.c
drivers/comedi/drivers/ni_labpc.h renamed from drivers/staging/comedi/drivers/ni_labpc.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_labpc.h
rename to drivers/comedi/drivers/ni_labpc.h
drivers/comedi/drivers/ni_labpc_common.c renamed from drivers/staging/comedi/drivers/ni_labpc_common.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_labpc_common.c
rename to drivers/comedi/drivers/ni_labpc_common.c
drivers/comedi/drivers/ni_labpc_cs.c renamed from drivers/staging/comedi/drivers/ni_labpc_cs.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_labpc_cs.c
rename to drivers/comedi/drivers/ni_labpc_cs.c
drivers/comedi/drivers/ni_labpc_isadma.c renamed from drivers/staging/comedi/drivers/ni_labpc_isadma.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_labpc_isadma.c
rename to drivers/comedi/drivers/ni_labpc_isadma.c
drivers/comedi/drivers/ni_labpc_isadma.h renamed from drivers/staging/comedi/drivers/ni_labpc_isadma.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_labpc_isadma.h
rename to drivers/comedi/drivers/ni_labpc_isadma.h
drivers/comedi/drivers/ni_labpc_pci.c renamed from drivers/staging/comedi/drivers/ni_labpc_pci.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_labpc_pci.c
rename to drivers/comedi/drivers/ni_labpc_pci.c
drivers/comedi/drivers/ni_labpc_regs.h renamed from drivers/staging/comedi/drivers/ni_labpc_regs.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_labpc_regs.h
rename to drivers/comedi/drivers/ni_labpc_regs.h
drivers/comedi/drivers/ni_mio_common.c renamed from drivers/staging/comedi/drivers/ni_mio_common.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_mio_common.c
rename to drivers/comedi/drivers/ni_mio_common.c
drivers/comedi/drivers/ni_mio_cs.c renamed from drivers/staging/comedi/drivers/ni_mio_cs.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_mio_cs.c
rename to drivers/comedi/drivers/ni_mio_cs.c
drivers/comedi/drivers/ni_pcidio.c renamed from drivers/staging/comedi/drivers/ni_pcidio.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_pcidio.c
rename to drivers/comedi/drivers/ni_pcidio.c
drivers/comedi/drivers/ni_pcimio.c renamed from drivers/staging/comedi/drivers/ni_pcimio.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_pcimio.c
rename to drivers/comedi/drivers/ni_pcimio.c
drivers/comedi/drivers/ni_routes.c renamed from drivers/staging/comedi/drivers/ni_routes.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routes.c
rename to drivers/comedi/drivers/ni_routes.c
drivers/comedi/drivers/ni_routes.h renamed from drivers/staging/comedi/drivers/ni_routes.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routes.h
rename to drivers/comedi/drivers/ni_routes.h
drivers/comedi/drivers/ni_routing/README renamed from drivers/staging/comedi/drivers/ni_routing/README +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/README
rename to drivers/comedi/drivers/ni_routing/README
drivers/comedi/drivers/ni_routing/ni_device_routes.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes.c
drivers/comedi/drivers/ni_routing/ni_device_routes.h renamed from drivers/staging/comedi/drivers/ni_routing/ni_device_routes.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes.h
rename to drivers/comedi/drivers/ni_routing/ni_device_routes.h
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/all.h
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/all.h
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6070e.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6070e.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6220.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6220.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6221.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6221.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6229.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6229.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6251.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6251.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6254.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6254.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6259.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6259.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6534.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6534.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6602.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6602.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6713.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6713.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6723.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6723.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6733.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6733.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxi-6030e.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6030e.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxi-6224.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6224.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxi-6225.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6225.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxi-6251.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6251.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxi-6733.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6733.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxie-6251.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6251.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxie-6535.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6535.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxie-6738.c
rename to drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6738.c
drivers/comedi/drivers/ni_routing/ni_route_values.c renamed from drivers/staging/comedi/drivers/ni_routing/ni_route_values.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_route_values.c
rename to drivers/comedi/drivers/ni_routing/ni_route_values.c
drivers/comedi/drivers/ni_routing/ni_route_values.h renamed from drivers/staging/comedi/drivers/ni_routing/ni_route_values.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_route_values.h
rename to drivers/comedi/drivers/ni_routing/ni_route_values.h
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_route_values/all.h
rename to drivers/comedi/drivers/ni_routing/ni_route_values/all.h
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_route_values/ni_660x.c
rename to drivers/comedi/drivers/ni_routing/ni_route_values/ni_660x.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_route_values/ni_eseries.c
rename to drivers/comedi/drivers/ni_routing/ni_route_values/ni_eseries.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/ni_route_values/ni_mseries.c
rename to drivers/comedi/drivers/ni_routing/ni_route_values/ni_mseries.c
drivers/comedi/drivers/ni_routing/tools/.gitignore renamed from drivers/staging/comedi/drivers/ni_routing/tools/.gitignore +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/tools/.gitignore
rename to drivers/comedi/drivers/ni_routing/tools/.gitignore
drivers/comedi/drivers/ni_routing/tools/Makefile renamed from drivers/staging/comedi/drivers/ni_routing/tools/Makefile +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/tools/Makefile
rename to drivers/comedi/drivers/ni_routing/tools/Makefile
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/tools/convert_c_to_py.c
rename to drivers/comedi/drivers/ni_routing/tools/convert_c_to_py.c
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/tools/convert_csv_to_c.py
rename to drivers/comedi/drivers/ni_routing/tools/convert_csv_to_c.py
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/tools/convert_py_to_csv.py
rename to drivers/comedi/drivers/ni_routing/tools/convert_py_to_csv.py
drivers/comedi/drivers/ni_routing/tools/csv_collection.py renamed from drivers/staging/comedi/drivers/ni_routing/tools/csv_collection.py +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/tools/csv_collection.py
rename to drivers/comedi/drivers/ni_routing/tools/csv_collection.py
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
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/tools/make_blank_csv.py
rename to drivers/comedi/drivers/ni_routing/tools/make_blank_csv.py
drivers/comedi/drivers/ni_routing/tools/ni_names.py renamed from drivers/staging/comedi/drivers/ni_routing/tools/ni_names.py +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_routing/tools/ni_names.py
rename to drivers/comedi/drivers/ni_routing/tools/ni_names.py
drivers/comedi/drivers/ni_stc.h renamed from drivers/staging/comedi/drivers/ni_stc.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_stc.h
rename to drivers/comedi/drivers/ni_stc.h
drivers/comedi/drivers/ni_tio.c renamed from drivers/staging/comedi/drivers/ni_tio.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_tio.c
rename to drivers/comedi/drivers/ni_tio.c
drivers/comedi/drivers/ni_tio.h renamed from drivers/staging/comedi/drivers/ni_tio.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_tio.h
rename to drivers/comedi/drivers/ni_tio.h
drivers/comedi/drivers/ni_tio_internal.h renamed from drivers/staging/comedi/drivers/ni_tio_internal.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_tio_internal.h
rename to drivers/comedi/drivers/ni_tio_internal.h
drivers/comedi/drivers/ni_tiocmd.c renamed from drivers/staging/comedi/drivers/ni_tiocmd.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_tiocmd.c
rename to drivers/comedi/drivers/ni_tiocmd.c
drivers/comedi/drivers/ni_usb6501.c renamed from drivers/staging/comedi/drivers/ni_usb6501.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ni_usb6501.c
rename to drivers/comedi/drivers/ni_usb6501.c
drivers/comedi/drivers/pcl711.c renamed from drivers/staging/comedi/drivers/pcl711.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/pcl711.c
rename to drivers/comedi/drivers/pcl711.c
drivers/comedi/drivers/pcl724.c renamed from drivers/staging/comedi/drivers/pcl724.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/pcl724.c
rename to drivers/comedi/drivers/pcl724.c
drivers/comedi/drivers/pcl726.c renamed from drivers/staging/comedi/drivers/pcl726.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/pcl726.c
rename to drivers/comedi/drivers/pcl726.c
drivers/comedi/drivers/pcl730.c renamed from drivers/staging/comedi/drivers/pcl730.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/pcl730.c
rename to drivers/comedi/drivers/pcl730.c
drivers/comedi/drivers/pcl812.c renamed from drivers/staging/comedi/drivers/pcl812.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/pcl812.c
rename to drivers/comedi/drivers/pcl812.c
drivers/comedi/drivers/pcl816.c renamed from drivers/staging/comedi/drivers/pcl816.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/pcl816.c
rename to drivers/comedi/drivers/pcl816.c
drivers/comedi/drivers/pcl818.c renamed from drivers/staging/comedi/drivers/pcl818.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/pcl818.c
rename to drivers/comedi/drivers/pcl818.c
drivers/comedi/drivers/pcm3724.c renamed from drivers/staging/comedi/drivers/pcm3724.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/pcm3724.c
rename to drivers/comedi/drivers/pcm3724.c
drivers/comedi/drivers/pcmad.c renamed from drivers/staging/comedi/drivers/pcmad.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/pcmad.c
rename to drivers/comedi/drivers/pcmad.c
drivers/comedi/drivers/pcmda12.c renamed from drivers/staging/comedi/drivers/pcmda12.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/pcmda12.c
rename to drivers/comedi/drivers/pcmda12.c
drivers/comedi/drivers/pcmmio.c renamed from drivers/staging/comedi/drivers/pcmmio.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/pcmmio.c
rename to drivers/comedi/drivers/pcmmio.c
drivers/comedi/drivers/pcmuio.c renamed from drivers/staging/comedi/drivers/pcmuio.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/pcmuio.c
rename to drivers/comedi/drivers/pcmuio.c
drivers/comedi/drivers/plx9052.h renamed from drivers/staging/comedi/drivers/plx9052.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/plx9052.h
rename to drivers/comedi/drivers/plx9052.h
drivers/comedi/drivers/plx9080.h renamed from drivers/staging/comedi/drivers/plx9080.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/plx9080.h
rename to drivers/comedi/drivers/plx9080.h
drivers/comedi/drivers/quatech_daqp_cs.c renamed from drivers/staging/comedi/drivers/quatech_daqp_cs.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/quatech_daqp_cs.c
rename to drivers/comedi/drivers/quatech_daqp_cs.c
drivers/comedi/drivers/rtd520.c renamed from drivers/staging/comedi/drivers/rtd520.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/rtd520.c
rename to drivers/comedi/drivers/rtd520.c
drivers/comedi/drivers/rti800.c renamed from drivers/staging/comedi/drivers/rti800.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/rti800.c
rename to drivers/comedi/drivers/rti800.c
drivers/comedi/drivers/rti802.c renamed from drivers/staging/comedi/drivers/rti802.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/rti802.c
rename to drivers/comedi/drivers/rti802.c
drivers/comedi/drivers/s526.c renamed from drivers/staging/comedi/drivers/s526.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/s526.c
rename to drivers/comedi/drivers/s526.c
drivers/comedi/drivers/s626.c renamed from drivers/staging/comedi/drivers/s626.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/s626.c
rename to drivers/comedi/drivers/s626.c
drivers/comedi/drivers/s626.h renamed from drivers/staging/comedi/drivers/s626.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/s626.h
rename to drivers/comedi/drivers/s626.h
drivers/comedi/drivers/ssv_dnp.c renamed from drivers/staging/comedi/drivers/ssv_dnp.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/ssv_dnp.c
rename to drivers/comedi/drivers/ssv_dnp.c
drivers/comedi/drivers/tests/Makefile renamed from drivers/staging/comedi/drivers/tests/Makefile +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/tests/Makefile
rename to drivers/comedi/drivers/tests/Makefile
drivers/comedi/drivers/tests/comedi_example_test.c renamed from drivers/staging/comedi/drivers/tests/comedi_example_test.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/tests/comedi_example_test.c
rename to drivers/comedi/drivers/tests/comedi_example_test.c
drivers/comedi/drivers/tests/ni_routes_test.c renamed from drivers/staging/comedi/drivers/tests/ni_routes_test.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/tests/ni_routes_test.c
rename to drivers/comedi/drivers/tests/ni_routes_test.c
drivers/comedi/drivers/tests/unittest.h renamed from drivers/staging/comedi/drivers/tests/unittest.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/tests/unittest.h
rename to drivers/comedi/drivers/tests/unittest.h
drivers/comedi/drivers/usbdux.c renamed from drivers/staging/comedi/drivers/usbdux.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/usbdux.c
rename to drivers/comedi/drivers/usbdux.c
drivers/comedi/drivers/usbduxfast.c renamed from drivers/staging/comedi/drivers/usbduxfast.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/usbduxfast.c
rename to drivers/comedi/drivers/usbduxfast.c
drivers/comedi/drivers/usbduxsigma.c renamed from drivers/staging/comedi/drivers/usbduxsigma.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/usbduxsigma.c
rename to drivers/comedi/drivers/usbduxsigma.c
drivers/comedi/drivers/vmk80xx.c renamed from drivers/staging/comedi/drivers/vmk80xx.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/vmk80xx.c
rename to drivers/comedi/drivers/vmk80xx.c
drivers/comedi/drivers/z8536.h renamed from drivers/staging/comedi/drivers/z8536.h +0 -0
similarity index 100%
rename from drivers/staging/comedi/drivers/z8536.h
rename to drivers/comedi/drivers/z8536.h
drivers/comedi/kcomedilib/Makefile renamed from drivers/staging/comedi/kcomedilib/Makefile +0 -0
similarity index 100%
rename from drivers/staging/comedi/kcomedilib/Makefile
rename to drivers/comedi/kcomedilib/Makefile
drivers/comedi/kcomedilib/kcomedilib_main.c renamed from drivers/staging/comedi/kcomedilib/kcomedilib_main.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/kcomedilib/kcomedilib_main.c
rename to drivers/comedi/kcomedilib/kcomedilib_main.c
drivers/comedi/proc.c renamed from drivers/staging/comedi/proc.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/proc.c
rename to drivers/comedi/proc.c
drivers/comedi/range.c renamed from drivers/staging/comedi/range.c +0 -0
similarity index 100%
rename from drivers/staging/comedi/range.c
rename to drivers/comedi/range.c
drivers/staging/Kconfig +0 -2
index 7b57b755bfa3..808e78d6cd98 100644
@@ -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
index 4350423f65aa..5a871f0ff2f4 100644
@@ -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