Remove some cruft leftover from when this driver was a single module that included support for both the ISA and PCI boards. Do a bit of additional cleanup. The v1 post of this series was originally 14 patches. Greg has applied the first 6 of those patches to his "test" branch in preperation of the release of 3.17-rc1. He dropped the rest of that series due to merge conflicts. This series fixes the merge conflict and adds one additional patch. The first 7 patches of this series have already been reviewed by Ian Abbott. H Hartley Sweeten (8): staging: comedi: amplc_dio200: tidy up comedi_driver declaration staging: comedi: amplc_dio200: tidy up {comedi,pci}_driver declarations staging: comedi: amplc_dio200.h: remove struct dio200_layout definition staging: comedi: amplc_dio200.h: remove unnecessary function comment descriptions staging: comedi: amplc_dio200.h: rename 'has_enhancements' in boardinfo staging: comedi: amplc_dio200.h: remove boardinfo 'mainshift' staging: comedi: amplc_dio200: absorb dio200_subdev_timer_init() staging: comedi: amplc_dio200: remove dio200_common_detach() drivers/staging/comedi/drivers/amplc_dio200.c | 98 +++--- drivers/staging/comedi/drivers/amplc_dio200.h | 19 +- .../staging/comedi/drivers/amplc_dio200_common.c | 355 +++++++-------------- drivers/staging/comedi/drivers/amplc_dio200_pci.c | 143 ++++----- 4 files changed, 227 insertions(+), 388 deletions(-) -- 2.0.3 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel