The original series to cleanup this driver had some merge difficulties. This is just a rebase of the patches that had issues, based on next-20130121. H Hartley Sweeten (5): staging: comedi: addi_apci_16xx: rewrite low-level support code staging: comedi: addi_apci_16xx: add missing copyright comment staging: comedi: addi_apci_16xx: remove unnecessary include staging: comedi: addi_apci_16xx: change the MODULE_DESCRIPTION staging: comedi: addi_apci_16xx: add defines for the PCI device ids .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 542 --------------------- drivers/staging/comedi/drivers/addi_apci_16xx.c | 174 +++++-- 2 files changed, 144 insertions(+), 572 deletions(-) delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c -- 1.8.0 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
