From c47db2345ca2b55b6146746333cba4522c136648 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 13 Oct 2010 09:18:53 +0000
Subject: [PATCH] --- yaml --- r: 215201 b: refs/heads/master c:
 cdd861d68d27a0d0ebe4e641d20d8cfa5cef405f h: refs/heads/master i:   215199:
 c91c9731d3dbd2e6fbd97cb41055394eed5b5ac8 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/ns83820.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c8f6e94d9b78..392a0702007c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccc901ee58cfb090a31216a6eda0f1e9dfc572fa
+refs/heads/master: cdd861d68d27a0d0ebe4e641d20d8cfa5cef405f
diff --git a/trunk/drivers/net/ns83820.c b/trunk/drivers/net/ns83820.c
index 3bbd0aab17e8..84134c766f3a 100644
--- a/trunk/drivers/net/ns83820.c
+++ b/trunk/drivers/net/ns83820.c
@@ -772,7 +772,7 @@ static int ns83820_setup_rx(struct net_device *ndev)
 		phy_intr(ndev);
 
 		/* Okay, let it rip */
-		spin_lock_irq(&dev->misc_lock);
+		spin_lock(&dev->misc_lock);
 		dev->IMR_cache |= ISR_PHY;
 		dev->IMR_cache |= ISR_RXRCMP;
 		//dev->IMR_cache |= ISR_RXERR;