On Wed, Mar 06, 2013 at 05:07:41PM -0600, H Hartley Sweeten wrote:
> On Wednesday, March 06, 2013 4:03 PM, H Hartley Sweeten wrote:
> > For aesthetic reasons, fix some whitespace issues.
> >
> > Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
> > Cc: Ian Abbott <abbotti@xxxxxxxxx>
> > Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> > ---
> > drivers/staging/comedi/drivers/adl_pci8164.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c
> > index 7c0bec7..471f4c6 100644
> > --- a/drivers/staging/comedi/drivers/adl_pci8164.c
> > +++ b/drivers/staging/comedi/drivers/adl_pci8164.c
> > @@ -72,7 +72,7 @@ static int adl_pci8164_insn_write(struct comedi_device *dev,
> > }
> >
> > static int adl_pci8164_auto_attach(struct comedi_device *dev,
> > - unsigned long context_unused)
> > + unsigned long context_unused)
> > {
> > struct pci_dev *pcidev = comedi_to_pci_dev(dev);
> > struct comedi_subdevice *s;
> > @@ -154,7 +154,7 @@ static struct comedi_driver adl_pci8164_driver = {
> > };
> >
> > static int adl_pci8164_pci_probe(struct pci_dev *dev,
> > - const struct pci_device_id *ent)
> > + const struct pci_device_id *ent)
> > {
> > return comedi_pci_auto_config(dev, &adl_pci8164_driver);
> > }
>
> Ugh... I just realized this patch, and possibly 8/8, will have merge issues if
>
> "[PATCH 01/49] staging: comedi: comedi_pci: change the comedi_pci_auto_config() 'context'"
>
> is already applied.
>
> Since Ian already okayed that series, please ignore patches 7/8 and 8/8
> in this series if they cause any trouble.
Yeah, it doesn't apply, so I've dropped these two patches. Feel free to
resend them now rebased on my latest tree.
thanks,
greg k-h
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
