git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'staging-next' into Linux 3.1
[pandora-kernel.git]
/
drivers
/
gpio
/
gpio-omap.c
diff --git
a/drivers/gpio/gpio-omap.c
b/drivers/gpio/gpio-omap.c
index
0599854
..
118ec12
100644
(file)
--- 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;
u16 irq;
u16 virtual_irq_start;
int method;
-#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
u32 suspend_wakeup;
u32 suspend_wakeup;
+#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
u32 saved_wakeup;
#endif
u32 non_wakeup_gpios;
u32 saved_wakeup;
#endif
u32 non_wakeup_gpios;