Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into...

[linux-3.10.git] / drivers / net / e1000 / e1000_ethtool.c

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 3a0b847fac316e82beb19763a57f3eb85b1edd57..88a82ba88f578b0216f213ca6ca1b4d525e741e7 100644 (file)
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -882,10 +882,10 @@ e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data)
        *data = 0;
 
        /* Hook up test interrupt handler just for this test */
        *data = 0;
 
        /* Hook up test interrupt handler just for this test */

-       if (!request_irq(irq, &e1000_test_intr, SA_PROBEIRQ, netdev->name,
-                        netdev)) {
+       if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED,
+                        netdev->name, netdev)) {

                shared_int = FALSE;
                shared_int = FALSE;

-       } else if (request_irq(irq, &e1000_test_intr, SA_SHIRQ,
+       } else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,

                              netdev->name, netdev)){
                *data = 1;
                return -1;
                              netdev->name, netdev)){
                *data = 1;
                return -1;