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 (7): staging: comedi: addi_apci_2200: use addi_watchdog module staging: comedi: addi_apci_2200: uremove devpriv allocation staging: comedi: addi_apci_2200: remove unnecessary boardinfo staging: comedi: addi_apci_2200: remove unnecessary include staging: comedi: addi_apci_2200: add missing copyright comment staging: comedi: addi_apci_2200: only allocate needed subdevices staging: comedi: addi_apci_2200: change the MODULE_DESCRIPTION drivers/staging/comedi/Kconfig | 1 + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 176 --------------------- drivers/staging/comedi/drivers/addi_apci_2200.c | 151 ++++++------------ 3 files changed, 52 insertions(+), 276 deletions(-) delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c -- 1.8.0 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
