]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - drivers/net/netxen/netxen_nic_main.c
Merge branch 'master' into upstream
[linux-2.6.git] / drivers / net / netxen / netxen_nic_main.c
index c2da7ec0248ad209cf46966322800f6727f0557c..225ff55527c447f1e0955eac185cec895e951548 100644 (file)
@@ -620,8 +620,8 @@ 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,
-                                 adapter);
+                                 IRQF_SHARED | IRQF_SAMPLE_RANDOM,
+                                 netdev->name, adapter);
                if (err) {
                        printk(KERN_ERR "request_irq failed with: %d\n", err);
                        netxen_free_hw_resources(adapter);