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 'topic/asoc' into for-linus
[pandora-kernel.git]
/
arch
/
mips
/
sgi-ip22
/
ip22-reset.c
diff --git
a/arch/mips/sgi-ip22/ip22-reset.c
b/arch/mips/sgi-ip22/ip22-reset.c
index
4ad5c33
..
45b6694
100644
(file)
--- a/
arch/mips/sgi-ip22/ip22-reset.c
+++ b/
arch/mips/sgi-ip22/ip22-reset.c
@@
-148,7
+148,7
@@
static irqreturn_t panel_int(int irq, void *dev_id)
if (sgint->istat1 & SGINT_ISTAT1_PWR) {
/* Wait until interrupt goes away */
- disable_irq(SGI_PANEL_IRQ);
+ disable_irq
_nosync
(SGI_PANEL_IRQ);
init_timer(&debounce_timer);
debounce_timer.function = debounce;
debounce_timer.expires = jiffies + 5;