diff options
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 6 | ||||
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index 6ed7f599eba3..d19664891768 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
@@ -871,10 +871,10 @@ e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data) | |||
871 | *data = 0; | 871 | *data = 0; |
872 | 872 | ||
873 | /* Hook up test interrupt handler just for this test */ | 873 | /* Hook up test interrupt handler just for this test */ |
874 | if (!request_irq(irq, &e1000_test_intr, SA_PROBEIRQ, netdev->name, | 874 | if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED, |
875 | netdev)) { | 875 | netdev->name, netdev)) { |
876 | shared_int = FALSE; | 876 | shared_int = FALSE; |
877 | } else if (request_irq(irq, &e1000_test_intr, SA_SHIRQ, | 877 | } else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED, |
878 | netdev->name, netdev)){ | 878 | netdev->name, netdev)){ |
879 | *data = 1; | 879 | *data = 1; |
880 | return -1; | 880 | return -1; |
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 32b7d444b374..f77624f5f17b 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -426,7 +426,7 @@ e1000_up(struct e1000_adapter *adapter) | |||
426 | } | 426 | } |
427 | #endif | 427 | #endif |
428 | if ((err = request_irq(adapter->pdev->irq, &e1000_intr, | 428 | if ((err = request_irq(adapter->pdev->irq, &e1000_intr, |
429 | SA_SHIRQ | SA_SAMPLE_RANDOM, | 429 | IRQF_SHARED | IRQF_SAMPLE_RANDOM, |
430 | netdev->name, netdev))) { | 430 | netdev->name, netdev))) { |
431 | DPRINTK(PROBE, ERR, | 431 | DPRINTK(PROBE, ERR, |
432 | "Unable to allocate interrupt Error: %d\n", err); | 432 | "Unable to allocate interrupt Error: %d\n", err); |