]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
ARM: OMAP: Fix gpio.c compile on 15xx with CONFIG_DEBUGFS
authorTony Lindgren <tony@atomide.com>
Thu, 15 Jan 2009 11:09:53 +0000 (13:09 +0200)
committerTony Lindgren <tony@atomide.com>
Thu, 15 Jan 2009 11:09:53 +0000 (13:09 +0200)
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>
arch/arm/plat-omap/gpio.c

index 07b6968a7d16745988883da1a2f6c1ba75b91f15..f856a90b264e3939042371fda8652d22ab2da9ba 100644 (file)
@@ -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");
                }