There was a merge conflict with the last 7 patches of: [PATCH 00/45] staging: comedi: cb_pcidas: cleanup driver Due to commit e4c0c6bc0c3baa6ba8cce4db5568fe9db5ad3c5f Staging: comedi: Remove unnecessary cast on void pointer Following are the rebased patches with Ian's Reviewed-by added. H Hartley Sweeten (7): staging: comedi: cb_pcidas: split ai code out of interrupt handler staging: comedi: cb_pcidas: consolidate interrupt clear code staging: comedi: cb_pcidas: absorb cal_enable_bits() staging: comedi: cb_pcidas: remove superfluous comment staging: comedi: cb_pcidas: fix cb_pcidas_ao_fifo_insn_write() staging: comedi: cb_pcidas: fix cb_pcidas_ao_nofifo_insn_write() staging: comedi: cb_pcidas: update MODULE_DESCRIPTION drivers/staging/comedi/drivers/cb_pcidas.c | 195 +++++++++++++++-------------- 1 file changed, 101 insertions(+), 94 deletions(-) -- 2.5.1 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
