From 8d1061e2b339ca306a5fc124a5a87458119321a0 Mon Sep 17 00:00:00 2001
From: "Ahmed S. Darwish" <darwish.07@gmail.com>
Date: Thu, 27 Sep 2007 01:35:43 +0300
Subject: [PATCH] --- yaml --- r: 66175 b: refs/heads/master c:
 4680576edecb640f64936bd9b92add0a56027b61 h: refs/heads/master i:   66173:
 704c85d4a727844eb83e3702d220e41310e75722   66171:
 b813ebf8d6caca043cbce5e7b260cbecfb062caa   66167:
 a611fcddd9fd3d357f045bab3e248b64b12d359b   66159:
 7e0c5fe7a80acf452d60b82b632d752d70135088   66143:
 a5e8628b13fc27456aa462f1cc898fc2d0e76547   66111:
 861b91d89e5a826d88829e217dd4e3b3a891f9a6   66047:
 37f1e64bb48547f0e7203290518cac78237efa49 v: v3

---
 [refs]                                            | 2 +-
 trunk/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 76daad9f8e6e..a107e55b5cd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05dc8c02bf40090e9ed23932b1980ead48eb8870
+refs/heads/master: 4680576edecb640f64936bd9b92add0a56027b61
diff --git a/trunk/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c b/trunk/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
index 6fa85728158b..ab96a2d7f4c4 100644
--- a/trunk/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
+++ b/trunk/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
@@ -163,7 +163,7 @@ static int msp_hwbutton_register(struct hwbutton_interrupt *hirq)
 		CIC_EXT_SET_ACTIVE_HI(cic_ext, hirq->eirq);
 	*CIC_EXT_CFG_REG = cic_ext;
 
-	return request_irq(hirq->irq, hwbutton_handler, SA_INTERRUPT,
+	return request_irq(hirq->irq, hwbutton_handler, IRQF_DISABLED,
 				hirq->name, (void *)hirq);
 }