From de0fa16cef733b541ab783668876150106de447c Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 10 May 2007 22:53:00 -0700
Subject: [PATCH] --- yaml --- r: 56227 b: refs/heads/master c:
 1c8e039a4bce0dae0d49c5df451f338a5d19363a h: refs/heads/master i:   56225:
 9c4007c2c8d2835e7cb302dfdf6dd03730a050eb   56223:
 8e48361409409592c2520d79c3e7b73a1d769472 v: v3

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

diff --git a/[refs] b/[refs]
index c4cc5ce2b39e..376ba2958824 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6c5fb3bd0dcf1bf3d6848fe890bf73051877a4a
+refs/heads/master: 1c8e039a4bce0dae0d49c5df451f338a5d19363a
diff --git a/trunk/drivers/net/netxen/netxen_nic_main.c b/trunk/drivers/net/netxen/netxen_nic_main.c
index 4e32bb678ea9..2c5c6d20e6e9 100644
--- a/trunk/drivers/net/netxen/netxen_nic_main.c
+++ b/trunk/drivers/net/netxen/netxen_nic_main.c
@@ -735,7 +735,7 @@ static int netxen_nic_open(struct net_device *netdev)
 		}
 		adapter->irq = adapter->ahw.pdev->irq;
 		err = request_irq(adapter->ahw.pdev->irq, netxen_intr,
-				  SA_SHIRQ | SA_SAMPLE_RANDOM, netdev->name,
+				  IRQF_SHARED|IRQF_SAMPLE_RANDOM, netdev->name,
 				  adapter);
 		if (err) {
 			printk(KERN_ERR "request_irq failed with: %d\n", err);