"comedidev.h" includes PCMCIA-specific stuff that gets included by all comedi drivers including non-PCMCIA ones. Separate it out into its own header "comedi_pcmcia.h". Make the new header include <pcmcia/cistpl.h>, <pcmcia/ds.h> and "comedidev.h" so that comedi PCMCIA drivers do not need to include them explicitly. 01) staging: comedi: add comedi_pcmcia.h 02) staging: comedi: comedi_pcmcia.c: include new "comedi_pcmcia.h" header 03) staging: comedi: cb_das16_cs: include new "comedi_pcmcia.h" header 04) staging: comedi: das08_cs: include new "comedi_pcmcia.h" header 05) staging: comedi: ni_daq_700: include new "comedi_pcmcia.h" header 06) staging: comedi: ni_daq_dio24: include new "comedi_pcmcia.h" header 07) staging: comedi: ni_labpc_cs: include new "comedi_pcmcia.h" header 08) staging: comedi: ni_mio_cs: include new "comedi_pcmcia.h" header 09) staging: comedi: quatech_daqp_cs: include new "comedi_pcmcia.h" header 10) staging: comedi: comedi_pcmcia.h: move PCMCIA stuff out of comedidev.h drivers/staging/comedi/comedi_pcmcia.c | 5 +-- drivers/staging/comedi/comedi_pcmcia.h | 55 ++++++++++++++++++++++++ drivers/staging/comedi/comedidev.h | 33 -------------- drivers/staging/comedi/drivers/cb_das16_cs.c | 5 +-- drivers/staging/comedi/drivers/das08_cs.c | 5 +-- drivers/staging/comedi/drivers/ni_daq_700.c | 5 +-- drivers/staging/comedi/drivers/ni_daq_dio24.c | 6 +-- drivers/staging/comedi/drivers/ni_labpc_cs.c | 6 +-- drivers/staging/comedi/drivers/ni_mio_cs.c | 6 +-- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 7 +-- 10 files changed, 63 insertions(+), 70 deletions(-) _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel