On Tue, Jun 14, 2011 at 05:05:11PM -0700, Randy Dunlap wrote: > From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> > > Make GPIOF_ defined values available even when GPIOLIB nor GENERIC_GPIO > is enabled by moving them to <linux/gpio.h>. > > Fixes these build errors in linux-next: > sound/soc/codecs/ak4641.c:524: error: 'GPIOF_OUT_INIT_LOW' undeclared (first use in this function) > sound/soc/codecs/wm8915.c:2921: error: 'GPIOF_OUT_INIT_LOW' undeclared (first use in this function) > > Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Applied, thanks. g. > --- > include/asm-generic/gpio.h | 10 ---------- > include/linux/gpio.h | 11 +++++++++++ > 2 files changed, 11 insertions(+), 10 deletions(-) > > --- linux-next-20110614.orig/include/asm-generic/gpio.h > +++ linux-next-20110614/include/asm-generic/gpio.h > @@ -170,16 +170,6 @@ extern int __gpio_cansleep(unsigned gpio > > extern int __gpio_to_irq(unsigned gpio); > > -#define GPIOF_DIR_OUT (0 << 0) > -#define GPIOF_DIR_IN (1 << 0) > - > -#define GPIOF_INIT_LOW (0 << 1) > -#define GPIOF_INIT_HIGH (1 << 1) > - > -#define GPIOF_IN (GPIOF_DIR_IN) > -#define GPIOF_OUT_INIT_LOW (GPIOF_DIR_OUT | GPIOF_INIT_LOW) > -#define GPIOF_OUT_INIT_HIGH (GPIOF_DIR_OUT | GPIOF_INIT_HIGH) > - > /** > * struct gpio - a structure describing a GPIO with configuration > * @gpio: the GPIO number > --- linux-next-20110614.orig/include/linux/gpio.h > +++ linux-next-20110614/include/linux/gpio.h > @@ -3,6 +3,17 @@ > > /* see Documentation/gpio.txt */ > > +/* make these flag values available regardless of GPIO kconfig options */ > +#define GPIOF_DIR_OUT (0 << 0) > +#define GPIOF_DIR_IN (1 << 0) > + > +#define GPIOF_INIT_LOW (0 << 1) > +#define GPIOF_INIT_HIGH (1 << 1) > + > +#define GPIOF_IN (GPIOF_DIR_IN) > +#define GPIOF_OUT_INIT_LOW (GPIOF_DIR_OUT | GPIOF_INIT_LOW) > +#define GPIOF_OUT_INIT_HIGH (GPIOF_DIR_OUT | GPIOF_INIT_HIGH) > + > #ifdef CONFIG_GENERIC_GPIO > #include <asm/gpio.h> > -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
