Staging: comedi: Remove comedi_insn typedef

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc drivers/staging/comedi/comedi.h
Simple merge

diff --cc drivers/staging/comedi/comedi_compat32.c
Simple merge

diff --cc drivers/staging/comedi/comedi_fops.c
Simple merge

diff --cc drivers/staging/comedi/comedidev.h
Simple merge

diff --cc drivers/staging/comedi/comedilib.h
Simple merge

diff --cc drivers/staging/comedi/drivers.c
Simple merge

diff --cc drivers/staging/comedi/drivers/8255.c
Simple merge

diff --cc drivers/staging/comedi/drivers/acl7225b.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/addi_common.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/addi_common.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
Simple merge

diff --cc drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
Simple merge

diff --cc drivers/staging/comedi/drivers/adl_pci6208.c
Simple merge

diff --cc drivers/staging/comedi/drivers/adl_pci7432.c
Simple merge

diff --cc drivers/staging/comedi/drivers/adl_pci8164.c
Simple merge

diff --cc drivers/staging/comedi/drivers/adl_pci9111.c
Simple merge

diff --cc drivers/staging/comedi/drivers/adl_pci9118.c
Simple merge

diff --cc drivers/staging/comedi/drivers/adq12b.c
Simple merge

diff --cc drivers/staging/comedi/drivers/adv_pci1710.c
Simple merge

diff --cc drivers/staging/comedi/drivers/adv_pci1723.c
Simple merge

diff --cc drivers/staging/comedi/drivers/adv_pci_dio.c
Simple merge

diff --cc drivers/staging/comedi/drivers/aio_aio12_8.c
Simple merge

diff --cc drivers/staging/comedi/drivers/aio_iiro_16.c
Simple merge

diff --cc drivers/staging/comedi/drivers/amplc_dio200.c
Simple merge

diff --cc drivers/staging/comedi/drivers/amplc_pc236.c
Simple merge

diff --cc drivers/staging/comedi/drivers/amplc_pc263.c
Simple merge

diff --cc drivers/staging/comedi/drivers/amplc_pci224.c
Simple merge

diff --cc drivers/staging/comedi/drivers/amplc_pci230.c
Simple merge

diff --cc drivers/staging/comedi/drivers/c6xdigio.c
Simple merge

diff --cc drivers/staging/comedi/drivers/cb_das16_cs.c
Simple merge

diff --cc drivers/staging/comedi/drivers/cb_pcidas.c
Simple merge

diff --cc drivers/staging/comedi/drivers/cb_pcidas64.c
Simple merge

diff --cc drivers/staging/comedi/drivers/cb_pcidda.c
Simple merge

diff --cc drivers/staging/comedi/drivers/cb_pcimdas.c
Simple merge

diff --cc drivers/staging/comedi/drivers/cb_pcimdda.c
Simple merge

diff --cc drivers/staging/comedi/drivers/comedi_bond.c
Simple merge

diff --cc drivers/staging/comedi/drivers/comedi_parport.c
Simple merge

diff --cc drivers/staging/comedi/drivers/comedi_rt_timer.c
Simple merge

diff --cc drivers/staging/comedi/drivers/comedi_test.c
Simple merge

diff --cc drivers/staging/comedi/drivers/contec_pci_dio.c
Simple merge

diff --cc drivers/staging/comedi/drivers/daqboard2000.c
Simple merge

diff --cc drivers/staging/comedi/drivers/das08.c
Simple merge

diff --cc drivers/staging/comedi/drivers/das16.c
Simple merge

diff --cc drivers/staging/comedi/drivers/das16m1.c
Simple merge

diff --cc drivers/staging/comedi/drivers/das1800.c
Simple merge

diff --cc drivers/staging/comedi/drivers/das800.c
Simple merge

diff --cc drivers/staging/comedi/drivers/dmm32at.c
Simple merge

diff --cc drivers/staging/comedi/drivers/dt2801.c
Simple merge

diff --cc drivers/staging/comedi/drivers/dt2811.c
Simple merge

diff --cc drivers/staging/comedi/drivers/dt2814.c
Simple merge

diff --cc drivers/staging/comedi/drivers/dt2815.c
Simple merge

diff --cc drivers/staging/comedi/drivers/dt2817.c
Simple merge

diff --cc drivers/staging/comedi/drivers/dt282x.c
Simple merge

diff --cc drivers/staging/comedi/drivers/dt3000.c
Simple merge

diff --cc drivers/staging/comedi/drivers/dt9812.c
Simple merge

diff --cc drivers/staging/comedi/drivers/fl512.c
Simple merge

diff --cc drivers/staging/comedi/drivers/gsc_hpdi.c
Simple merge

diff --cc drivers/staging/comedi/drivers/icp_multi.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ii_pci20kc.c
Simple merge

diff --cc drivers/staging/comedi/drivers/jr3_pci.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ke_counter.c
Simple merge

diff --cc drivers/staging/comedi/drivers/me4000.c
Simple merge

diff --cc drivers/staging/comedi/drivers/me_daq.c
Simple merge

diff --cc drivers/staging/comedi/drivers/mpc624.c
Simple merge

diff --cc drivers/staging/comedi/drivers/mpc8260cpm.c
Simple merge

diff --cc drivers/staging/comedi/drivers/multiq3.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_6527.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_65xx.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_660x.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_670x.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_at_a2150.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_at_ao.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_atmio16d.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_daq_700.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_labpc.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_mio_common.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_pcidio.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_tio.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_tio.h
Simple merge

diff --cc drivers/staging/comedi/drivers/pcl711.c
Simple merge

diff --cc drivers/staging/comedi/drivers/pcl724.c
Simple merge

diff --cc drivers/staging/comedi/drivers/pcl725.c
Simple merge

diff --cc drivers/staging/comedi/drivers/pcl726.c
Simple merge

diff --cc drivers/staging/comedi/drivers/pcl730.c
Simple merge

diff --cc drivers/staging/comedi/drivers/pcl812.c
Simple merge

diff --cc drivers/staging/comedi/drivers/pcl816.c
Simple merge

diff --cc drivers/staging/comedi/drivers/pcl818.c
Simple merge

diff --cc drivers/staging/comedi/drivers/pcm3724.c
Simple merge

diff --cc drivers/staging/comedi/drivers/pcm3730.c
Simple merge

diff --cc drivers/staging/comedi/drivers/pcmad.c
Simple merge

diff --cc drivers/staging/comedi/drivers/pcmda12.c
Simple merge

diff --cc drivers/staging/comedi/drivers/pcmmio.c
Simple merge

diff --cc drivers/staging/comedi/drivers/pcmuio.c
Simple merge

diff --cc drivers/staging/comedi/drivers/poc.c
Simple merge

diff --cc drivers/staging/comedi/drivers/quatech_daqp_cs.c
Simple merge

diff --cc drivers/staging/comedi/drivers/rtd520.c
Simple merge

diff --cc drivers/staging/comedi/drivers/rti800.c
Simple merge

diff --cc drivers/staging/comedi/drivers/rti802.c
Simple merge

diff --cc drivers/staging/comedi/drivers/s526.c
Simple merge

diff --cc drivers/staging/comedi/drivers/s626.c
Simple merge

diff --cc drivers/staging/comedi/drivers/serial2002.c
Simple merge

diff --cc drivers/staging/comedi/drivers/skel.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ssv_dnp.c
Simple merge

diff --cc drivers/staging/comedi/drivers/unioxx5.c
Simple merge

diff --cc drivers/staging/comedi/drivers/usbdux.c
Simple merge

diff --cc drivers/staging/comedi/drivers/usbduxfast.c
Simple merge

diff --cc drivers/staging/comedi/kcomedilib/data.c
Simple merge

diff --cc drivers/staging/comedi/kcomedilib/dio.c
Simple merge

diff --cc drivers/staging/comedi/kcomedilib/kcomedilib_main.c
Simple merge