| Message ID | 201108231342.25101.jkrzyszt@tis.icnet.pl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> writes: > 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> Verified that this fixes a build problem when building for OMAP1 (730/850 only) Acked-by: Kevin Hilman <khilman@ti.com> Grant, can you queue this as a fix for 3.1-rc? Thanks, Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- 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;
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> --- drivers/gpio/gpio-omap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html