From 189c165c8696b2a7beee09a878d8946af412a6c7 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 15 Jan 2009 13:09:53 +0200 Subject: [PATCH] --- yaml --- r: 130227 b: refs/heads/master c: 3a26e3318bc2ceec340f242c6ee7074becdc7219 h: refs/heads/master i: 130225: e33b3a180dee89b3f8da93c7fadd5a1ff11e366e 130223: 63ea3d5d95200a4a7209595e1691e924186fe943 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/gpio.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0b4a42ff3760..bc68cf08d242 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 145d9c94b9039efdab6853255f6b916adc793bfd +refs/heads/master: 3a26e3318bc2ceec340f242c6ee7074becdc7219 diff --git a/trunk/arch/arm/plat-omap/gpio.c b/trunk/arch/arm/plat-omap/gpio.c index 07b6968a7d16..f856a90b264e 100644 --- a/trunk/arch/arm/plat-omap/gpio.c +++ b/trunk/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"); }