Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 78a43158724793f9dc25f1e4c866393654704b87

Authored by Janusz Krzysztofik
Committed by Grant Likely
1 parent 976d167615
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

gpio/omap: fix build error with certain OMAP1 configs 

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/gpio/gpio-omap.c
Diff comments   View file @ 78a4315
... ... @@ -34,8 +34,8 @@
34 34 u16 irq;
35 35 u16 virtual_irq_start;
36 36 int method;
37   -#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
38 37 u32 suspend_wakeup;
  38 +#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
39 39 u32 saved_wakeup;
40 40 #endif
41 41 u32 non_wakeup_gpios;