summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-01-15 13:09:53 +0200
committerTony Lindgren <tony@atomide.com>2009-01-15 13:09:53 +0200
commit3a26e3318bc2ceec340f242c6ee7074becdc7219 (patch)
treea9dcd953a4dd54fce41726dbf3b9292e02f8c4ec /arch/arm
parent145d9c94b9039efdab6853255f6b916adc793bfd (diff)
downloadlinux-3a26e3318bc2ceec340f242c6ee7074becdc7219.tar.gz
linux-3a26e3318bc2ceec340f242c6ee7074becdc7219.tar.bz2
linux-3a26e3318bc2ceec340f242c6ee7074becdc7219.zip
ARM: OMAP: Fix gpio.c compile on 15xx with CONFIG_DEBUGFS
There are no wakeup registers on 15xx, and suspend_wakeup does not exist in the struct gpio_bank. Without this fix we'll get "arch/arm/plat-omap/gpio.c:1792: error: 'struct gpio_bank' has no member named 'suspend_wakeup'" as noted by Russell King. Note that the ifdefs will be cleaned up once the omap gpio code gets split into omap1 and omap2 specific parts. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/plat-omap/gpio.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 07b6968a7d16..f856a90b264e 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -1789,6 +1789,8 @@ static int dbg_gpio_show(struct seq_file *s, void *unused)
/* FIXME for at least omap2, show pullup/pulldown state */
irqstat = irq_desc[irq].status;
+#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || \
+ defined(CONFIG_ARCH_OMAP34XX)
if (is_in && ((bank->suspend_wakeup & mask)
|| irqstat & IRQ_TYPE_SENSE_MASK)) {
char *trigger = NULL;
@@ -1818,6 +1820,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused)
(bank->suspend_wakeup & mask)
? " wakeup" : "");
}
+#endif
seq_printf(s, "\n");
}