On Mon, Jan 07, 2013 at 04:48:08PM -0600, H Hartley Sweeten wrote: > On Monday, January 07, 2013 3:33 PM, Greg Kroah-Hartman wrote: > > On Fri, Dec 21, 2012 at 09:36:50AM -0700, H Hartley Sweeten wrote: > >> Create a new file, comedi_buf.c, to hold all the comedi_async buffer > >> functions. Currently they are all in drivers.c and really don't have > >> any association with that source file. > >> > >> Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx> > >> Cc: Ian Abbott <abbobbi@xxxxxxxxx> > >> --- > >> drivers/staging/comedi/Makefile | 3 +- > >> drivers/staging/comedi/comedi_buf.c | 421 ++++++++++++++++++++++++++++++++++++ > >> drivers/staging/comedi/drivers.c | 398 ---------------------------------- > >> 3 files changed, 423 insertions(+), 399 deletions(-) > >> create mode 100644 drivers/staging/comedi/comedi_buf.c > >> > >> diff --git a/drivers/staging/comedi/Makefile b/drivers/staging/comedi/Makefile > >> index f895c0c..51816c3 100644 > >> --- a/drivers/staging/comedi/Makefile > >> +++ b/drivers/staging/comedi/Makefile > >> @@ -1,4 +1,5 @@ > >> -comedi-y := comedi_fops.o range.o drivers.o > >> +comedi-y := comedi_fops.o range.o drivers.o \ > >> + comedi_buf.o > >> comedi-$(CONFIG_PROC_FS) += proc.o > >> comedi-$(CONFIG_COMPAT) += comedi_compat32.o > > > > This patch fails to apply as you changed the Makefile on a previous > > patch you sent me. > > Hmm... The following patch is what changed the Makefile. > > staging: comedi: Makefile: conditionally compile multi-file core module > > It _looks_ like that one should still apply but I might have missed something > that you have. > > > And, I'm not quite sure what the status is of all of these patches in > > the series, was there ever a consensus? > > Ian had some comments on patches 7, 8, 9, and 10 of the [PATCH 0/11] > series dealing with the comedi_buf. He was ok with the others. > > > So, if they are still needed, and work properly, care to redo them > > against my latest tree and resend? > > I will redo these patches without the ones in question and also redo the > [PATCH 0/6] series dealing with the drivers (core). > > Please let me know if you also need to single patch, listed above, that > modifies the Makefile. No, I now applied it, for some reason it ended up in another temporary mbox. You should now see it in my tree, sorry for the noise. greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
