On Thu, Sep 18, 2008 at 11:32:42AM +0200, Uwe Kleine-König wrote:
> Andrew Morton wrote:
> > > diff --git a/include/asm-mips/mach-rc32434/gpio.h b/include/asm-mips/mach-rc32434/gpio.h
> > > index f946f5f..9b4722e 100644
> > > --- a/include/asm-mips/mach-rc32434/gpio.h
> > > +++ b/include/asm-mips/mach-rc32434/gpio.h
> > > @@ -13,6 +13,7 @@
> > > #ifndef _RC32434_GPIO_H_
> > > #define _RC32434_GPIO_H_
> > >
> > > +#include <linux/kernel.h>
> > > #include <linux/types.h>
> > >
> > > struct rb532_gpio_reg {
> > > @@ -88,6 +89,7 @@ static inline int gpio_request(unsigned gpio, const char *label)
> > > static inline void gpio_free(unsigned gpio)
> > > {
> > > /* Not yet implemented */
> > > + might_sleep();
> > > }
> > >
> >
> > There is no gpio_free() in linux-next's include/asm-mips/mach-rc32434/gpio.h
> This is OK. This machine type is converted to GPIO lib in linus-next.
> So just drop the two hunks for this file. (Note, you only dropped the
> addition of might_sleep, but then including linux/kernel.h isn't needed
> either.)
A few days ago I've put a patch to move include/asm-mips/ to arch/ like
several other architectures already did so you patch may conflict ...
Ralf
