From 1abab2043cf281053df0c07f02bdeeaef2ae9fc6 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sat, 16 May 2009 12:23:45 +0100
Subject: [PATCH] --- yaml --- r: 145186 b: refs/heads/master c:
 7e9e05cad94217498e4d9bd6ef7137b4e9e7ed64 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/mips/sgi-ip22/ip22-reset.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index df0da8eb8f30..423aeb951347 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 950312ce22696ddfa42a957bdadaa9c24151e679
+refs/heads/master: 7e9e05cad94217498e4d9bd6ef7137b4e9e7ed64
diff --git a/trunk/arch/mips/sgi-ip22/ip22-reset.c b/trunk/arch/mips/sgi-ip22/ip22-reset.c
index 4ad5c3393fd3..45b6694c2079 100644
--- a/trunk/arch/mips/sgi-ip22/ip22-reset.c
+++ b/trunk/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;