Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 130227
b: refs/heads/master
c: 3a26e33
h: refs/heads/master
i:
  130225: e33b3a1
  130223: 63ea3d5
v: v3
  • Loading branch information
Tony Lindgren committed Jan 15, 2009
1 parent 1cb83f0 commit 189c165
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 145d9c94b9039efdab6853255f6b916adc793bfd
refs/heads/master: 3a26e3318bc2ceec340f242c6ee7074becdc7219
3 changes: 3 additions & 0 deletions trunk/arch/arm/plat-omap/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
}

Expand Down

0 comments on commit 189c165

Please sign in to comment.