aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pasemi_mac.c
diff options
context:
space:
mode:
authorAndrea Bastoni <bastoni@cs.unc.edu>2010-05-30 19:16:45 -0400
committerAndrea Bastoni <bastoni@cs.unc.edu>2010-05-30 19:16:45 -0400
commitada47b5fe13d89735805b566185f4885f5a3f750 (patch)
tree644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/pasemi_mac.c
parent43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff)
parent3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff)
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/pasemi_mac.c')
-rw-r--r--drivers/net/pasemi_mac.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index c254a7f5b9f5..370c147d08a3 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -20,6 +20,7 @@
20#include <linux/init.h> 20#include <linux/init.h>
21#include <linux/module.h> 21#include <linux/module.h>
22#include <linux/pci.h> 22#include <linux/pci.h>
23#include <linux/slab.h>
23#include <linux/interrupt.h> 24#include <linux/interrupt.h>
24#include <linux/dmaengine.h> 25#include <linux/dmaengine.h>
25#include <linux/delay.h> 26#include <linux/delay.h>
@@ -1216,7 +1217,7 @@ static int pasemi_mac_open(struct net_device *dev)
1216 snprintf(mac->tx_irq_name, sizeof(mac->tx_irq_name), "%s tx", 1217 snprintf(mac->tx_irq_name, sizeof(mac->tx_irq_name), "%s tx",
1217 dev->name); 1218 dev->name);
1218 1219
1219 ret = request_irq(mac->tx->chan.irq, &pasemi_mac_tx_intr, IRQF_DISABLED, 1220 ret = request_irq(mac->tx->chan.irq, pasemi_mac_tx_intr, IRQF_DISABLED,
1220 mac->tx_irq_name, mac->tx); 1221 mac->tx_irq_name, mac->tx);
1221 if (ret) { 1222 if (ret) {
1222 dev_err(&mac->pdev->dev, "request_irq of irq %d failed: %d\n", 1223 dev_err(&mac->pdev->dev, "request_irq of irq %d failed: %d\n",
@@ -1227,7 +1228,7 @@ static int pasemi_mac_open(struct net_device *dev)
1227 snprintf(mac->rx_irq_name, sizeof(mac->rx_irq_name), "%s rx", 1228 snprintf(mac->rx_irq_name, sizeof(mac->rx_irq_name), "%s rx",
1228 dev->name); 1229 dev->name);
1229 1230
1230 ret = request_irq(mac->rx->chan.irq, &pasemi_mac_rx_intr, IRQF_DISABLED, 1231 ret = request_irq(mac->rx->chan.irq, pasemi_mac_rx_intr, IRQF_DISABLED,
1231 mac->rx_irq_name, mac->rx); 1232 mac->rx_irq_name, mac->rx);
1232 if (ret) { 1233 if (ret) {
1233 dev_err(&mac->pdev->dev, "request_irq of irq %d failed: %d\n", 1234 dev_err(&mac->pdev->dev, "request_irq of irq %d failed: %d\n",
@@ -1875,7 +1876,7 @@ static void __devexit pasemi_mac_remove(struct pci_dev *pdev)
1875 free_netdev(netdev); 1876 free_netdev(netdev);
1876} 1877}
1877 1878
1878static struct pci_device_id pasemi_mac_pci_tbl[] = { 1879static DEFINE_PCI_DEVICE_TABLE(pasemi_mac_pci_tbl) = {
1879 { PCI_DEVICE(PCI_VENDOR_ID_PASEMI, 0xa005) }, 1880 { PCI_DEVICE(PCI_VENDOR_ID_PASEMI, 0xa005) },
1880 { PCI_DEVICE(PCI_VENDOR_ID_PASEMI, 0xa006) }, 1881 { PCI_DEVICE(PCI_VENDOR_ID_PASEMI, 0xa006) },
1881 { }, 1882 { },