]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
gpio/omap: fix build error with certain OMAP1 configs
authorJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Tue, 23 Aug 2011 11:42:24 +0000 (13:42 +0200)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 13 Oct 2011 17:48:25 +0000 (11:48 -0600)
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>
Acked-by: Kevin Hilman <khilman@ti.com>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
drivers/gpio/gpio-omap.c

index 0599854e22171449ed214366140313b4ac38e152..118ec12d2d5f9453118d98b27d8a7b88039b0221 100644 (file)
@@ -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;