aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpio/gpio-omap.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-14 17:07:52 +1200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-14 17:07:52 +1200
commite9308cfd5ab4ade3d81cf591c7599c3a05a21b04 (patch)
treed1ca7c4ee3ba7d563d83af5b20ac25c30817bd19 /drivers/gpio/gpio-omap.c
parent480082968a78151e731ebd304eeb6cada61a1cd1 (diff)
parent25fcf2b7f1f65d2cc12182ced3ccd47576970be4 (diff)
downloadlinux-linaro-stable-e9308cfd5ab4ade3d81cf591c7599c3a05a21b04.tar.gz
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6: gpio-pca953x: fix gpio_base gpio/omap: fix build error with certain OMAP1 configs
Diffstat (limited to 'drivers/gpio/gpio-omap.c')
-rw-r--r--drivers/gpio/gpio-omap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 0599854e2217..118ec12d2d5f 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -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;