Messages in this thread | | | Date | Thu, 13 Oct 2011 11:47:48 -0600 | From | Grant Likely <> | Subject | Re: [PATCH 3.1-rc3] gpio/omap: fix build error with certain OMAP1 configs |
| |
On Tue, Aug 23, 2011 at 01:42:24PM +0200, Janusz Krzysztofik wrote: > With commit f64ad1a0e21a, "gpio/omap: cleanup _set_gpio_wakeup(), remove > ifdefs", access to build time conditionally omitted 'suspend_wakeup' > member of the 'gpio_bank' structure has been placed unconditionally in > function _set_gpio_wakeup(), which is always built. This resulted in the > driver compilation broken for certain OMAP1, i.e., non-OMAP16xx, > configurations. > > Really required or not in previously excluded cases, define this > structure member unconditionally as a fix. > > Tested with a custom OMAP1510 only configuration. > > Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Applied, thanks.
g.
> --- > drivers/gpio/gpio-omap.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- git/drivers/gpio/gpio-omap.c.orig 2011-08-22 08:34:02.000000000 +0200 > +++ git/drivers/gpio/gpio-omap.c 2011-08-23 12:47:36.000000000 +0200 > @@ -34,8 +34,8 @@ struct gpio_bank { > u16 irq; > u16 virtual_irq_start; > int method; > -#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS) > u32 suspend_wakeup; > +#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS) > u32 saved_wakeup; > #endif > u32 non_wakeup_gpios;
| |