On Thu, Jan 17, 2013 at 05:41:44PM -0700, H Hartley Sweeten wrote: > The current watchdog support in hwdrv_apci2200.c does not conform > to the comedi API. > > Use the addi_watchdog module to provide support for the watchdog > subdevice and remove the now unneeded hwdrv_apci2200.c file. > > Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx> > Cc: Ian Abbott <abbotti@xxxxxxxxx> > --- > drivers/staging/comedi/Kconfig | 1 + > .../comedi/drivers/addi-data/hwdrv_apci2200.c | 176 --------------------- > drivers/staging/comedi/drivers/addi_apci_2200.c | 36 ++--- > 3 files changed, 10 insertions(+), 203 deletions(-) > delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c Are you sure you made this patch correctly? I get the following error when applying it: patching file drivers/staging/comedi/Kconfig patching file drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c.rej patching file drivers/staging/comedi/drivers/addi_apci_2200.c So I've stopped applying this series here, care to resend the 17-23 patches again after fixing this up? thanks, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
