From 8c324d761d8754ba57e97655ee7edaeca1a078e1 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Sat, 23 Aug 2008 23:43:38 +0200
Subject: [PATCH] --- yaml --- r: 111881 b: refs/heads/master c:
 2a1867a76fc13499521af1f0dbcf08ddb3ef78ba h: refs/heads/master i:   111879:
 7db6cf3d1aaa395604d898754bb585fcf17af868 v: v3

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

diff --git a/[refs] b/[refs]
index 681d68276c02..88e0b4320744 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a499481c167977368a7e7cae8ea1ff2a99518a0
+refs/heads/master: 2a1867a76fc13499521af1f0dbcf08ddb3ef78ba
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
index ad2ae937443d..8c812c3d1b7d 100644
--- a/trunk/drivers/net/mv643xx_eth.c
+++ b/trunk/drivers/net/mv643xx_eth.c
@@ -2004,8 +2004,7 @@ static int mv643xx_eth_open(struct net_device *dev)
 	rdl(mp, INT_CAUSE_EXT(mp->port_num));
 
 	err = request_irq(dev->irq, mv643xx_eth_irq,
-			  IRQF_SHARED | IRQF_SAMPLE_RANDOM,
-			  dev->name, dev);
+			  IRQF_SHARED, dev->name, dev);
 	if (err) {
 		dev_printk(KERN_ERR, &dev->dev, "can't assign irq\n");
 		return -EAGAIN;