"comedidev.h" includes PCI-specific stuff that gets included by all comedi drivers including non-PCI ones. Separate it out into its own header "comedi_pci.h". Make the new header include <linux/pci.h> and "comedidev.h" so that comedi PCI drivers do not need to include them explicitly. 01) staging: comedi: add comedi_pci.h 02) staging: comedi: comedi_pci.c: include new "comedi_pci.h" header 03) staging: comedi: 8255_pci: include new "comedi_pci.h" header 04) staging: comedi: addi_apci_1032: include new "comedi_pci.h" header 05) staging: comedi: addi_apci_1500: include new "comedi_pci.h" header 06) staging: comedi: addi_apci_1516: include new "comedi_pci.h" header 07) staging: comedi: addi_apci_1564: include new "comedi_pci.h" header 08) staging: comedi: addi_apci_16xx: include new "comedi_pci.h" header 09) staging: comedi: addi_apci_2032: include new "comedi_pci.h" header 10) staging: comedi: addi_apci_2200: include new "comedi_pci.h" header 11) staging: comedi: addi_apci_3120: include new "comedi_pci.h" header 12) staging: comedi: addi_apci_3501: include new "comedi_pci.h" header 13) staging: comedi: addi_apci_3xxx: include new "comedi_pci.h" header 14) staging: comedi: adl_pci6208: include new "comedi_pci.h" header 15) staging: comedi: adl_pci7x3x: include new "comedi_pci.h" header 16) staging: comedi: adl_pci8164: include new "comedi_pci.h" header 17) staging: comedi: adl_pci9111: include new "comedi_pci.h" header 18) staging: comedi: adl_pci9118: include new "comedi_pci.h" header 19) staging: comedi: adv_pci1710: include new "comedi_pci.h" header 20) staging: comedi: adv_pci1723: include new "comedi_pci.h" header 21) staging: comedi: adv_pci1724: include new "comedi_pci.h" header 22) staging: comedi: adv_pci_dio: include new "comedi_pci.h" header 23) staging: comedi: amplc_dio200_pci: include new "comedi_pci.h" header 24) staging: comedi: amplc_pci224: include new "comedi_pci.h" header 25) staging: comedi: amplc_pci230: include new "comedi_pci.h" header 26) staging: comedi: amplc_pci236: include new "comedi_pci.h" header 27) staging: comedi: amplc_pci263: include new "comedi_pci.h" header 28) staging: comedi: cb_pcidas64: include new "comedi_pci.h" header 29) staging: comedi: cb_pcidas: include new "comedi_pci.h" header 30) staging: comedi: cb_pcidda: include new "comedi_pci.h" header 31) staging: comedi: cb_pcimdas: include new "comedi_pci.h" header 32) staging: comedi: cb_pcimdda: include new "comedi_pci.h" header 33) staging: comedi: contec_pci_dio: include new "comedi_pci.h" header 34) staging: comedi: daqboard2000: include new "comedi_pci.h" header 35) staging: comedi: das08_pci: include new "comedi_pci.h" header 36) staging: comedi: dt3000: include new "comedi_pci.h" header 37) staging: comedi: dyna_pci10xx: include new "comedi_pci.h" header 38) staging: comedi: gsc_hpdi: include new "comedi_pci.h" header 39) staging: comedi: icp_multi: include new "comedi_pci.h" header 40) staging: comedi: jr3_pci: include new "comedi_pci.h" header 41) staging: comedi: ke_counter: include new "comedi_pci.h" header 42) staging: comedi: me4000: include new "comedi_pci.h" header 43) staging: comedi: me_daq: include new "comedi_pci.h" header 44) staging: comedi: mf6x4: include new "comedi_pci.h" header 45) staging: comedi: mite.c: include new "comedi_pci.h" header 46) staging: comedi: mite.h: include new "comedi_pci.h" header 47) staging: comedi: ni_6527: include new "comedi_pci.h" header 48) staging: comedi: ni_65xx: include new "comedi_pci.h" header 49) staging: comedi: ni_660x: include new "comedi_pci.h" header 50) staging: comedi: ni_670x: include new "comedi_pci.h" header 51) staging: comedi: ni_labpc_pci: include new "comedi_pci.h" header 52) staging: comedi: ni_pcmdio: include new "comedi_pci.h" header 53) staging: comedi: ni_pcmmio: include new "comedi_pci.h" header 54) staging: comedi: rtd520: include new "comedi_pci.h" header 55) staging: comedi: s626: include new "comedi_pci.h" header 56) staging: comedi: comedi_pci.h: move PCI stuff out of comedidev.h drivers/staging/comedi/comedi_pci.c | 3 +- drivers/staging/comedi/comedi_pci.h | 64 +++++++++++++++++++++++ drivers/staging/comedi/comedidev.h | 43 --------------- drivers/staging/comedi/drivers/8255_pci.c | 3 +- drivers/staging/comedi/drivers/addi_apci_1032.c | 3 +- drivers/staging/comedi/drivers/addi_apci_1500.c | 3 +- drivers/staging/comedi/drivers/addi_apci_1516.c | 3 +- drivers/staging/comedi/drivers/addi_apci_1564.c | 3 +- drivers/staging/comedi/drivers/addi_apci_16xx.c | 3 +- drivers/staging/comedi/drivers/addi_apci_2032.c | 3 +- drivers/staging/comedi/drivers/addi_apci_2200.c | 3 +- drivers/staging/comedi/drivers/addi_apci_3120.c | 3 +- drivers/staging/comedi/drivers/addi_apci_3501.c | 3 +- drivers/staging/comedi/drivers/addi_apci_3xxx.c | 3 +- drivers/staging/comedi/drivers/adl_pci6208.c | 3 +- drivers/staging/comedi/drivers/adl_pci7x3x.c | 3 +- drivers/staging/comedi/drivers/adl_pci8164.c | 3 +- drivers/staging/comedi/drivers/adl_pci9111.c | 3 +- drivers/staging/comedi/drivers/adl_pci9118.c | 3 +- drivers/staging/comedi/drivers/adv_pci1710.c | 3 +- drivers/staging/comedi/drivers/adv_pci1723.c | 3 +- drivers/staging/comedi/drivers/adv_pci1724.c | 3 +- drivers/staging/comedi/drivers/adv_pci_dio.c | 3 +- drivers/staging/comedi/drivers/amplc_dio200_pci.c | 3 +- drivers/staging/comedi/drivers/amplc_pci224.c | 3 +- drivers/staging/comedi/drivers/amplc_pci230.c | 3 +- drivers/staging/comedi/drivers/amplc_pci236.c | 3 +- drivers/staging/comedi/drivers/amplc_pci263.c | 3 +- drivers/staging/comedi/drivers/cb_pcidas.c | 3 +- drivers/staging/comedi/drivers/cb_pcidas64.c | 3 +- drivers/staging/comedi/drivers/cb_pcidda.c | 3 +- drivers/staging/comedi/drivers/cb_pcimdas.c | 3 +- drivers/staging/comedi/drivers/cb_pcimdda.c | 3 +- drivers/staging/comedi/drivers/contec_pci_dio.c | 3 +- drivers/staging/comedi/drivers/daqboard2000.c | 3 +- drivers/staging/comedi/drivers/das08_pci.c | 3 +- drivers/staging/comedi/drivers/dt3000.c | 3 +- drivers/staging/comedi/drivers/dyna_pci10xx.c | 3 +- drivers/staging/comedi/drivers/gsc_hpdi.c | 3 +- drivers/staging/comedi/drivers/icp_multi.c | 3 +- drivers/staging/comedi/drivers/jr3_pci.c | 3 +- drivers/staging/comedi/drivers/ke_counter.c | 3 +- drivers/staging/comedi/drivers/me4000.c | 3 +- drivers/staging/comedi/drivers/me_daq.c | 3 +- drivers/staging/comedi/drivers/mf6x4.c | 4 +- drivers/staging/comedi/drivers/mite.c | 3 +- drivers/staging/comedi/drivers/mite.h | 3 +- drivers/staging/comedi/drivers/ni_6527.c | 3 +- drivers/staging/comedi/drivers/ni_65xx.c | 3 +- drivers/staging/comedi/drivers/ni_660x.c | 3 +- drivers/staging/comedi/drivers/ni_670x.c | 3 +- drivers/staging/comedi/drivers/ni_labpc_pci.c | 3 +- drivers/staging/comedi/drivers/ni_pcidio.c | 2 +- drivers/staging/comedi/drivers/ni_pcimio.c | 2 +- drivers/staging/comedi/drivers/rtd520.c | 3 +- drivers/staging/comedi/drivers/s626.c | 3 +- 56 files changed, 119 insertions(+), 149 deletions(-) _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel