aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/rrunner.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/rrunner.c')
-rw-r--r--drivers/net/rrunner.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index 20a71749154a..f2e335f0d1b7 100644
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -40,6 +40,7 @@
40#include <linux/init.h> 40#include <linux/init.h>
41#include <linux/delay.h> 41#include <linux/delay.h>
42#include <linux/mm.h> 42#include <linux/mm.h>
43#include <linux/slab.h>
43#include <net/sock.h> 44#include <net/sock.h>
44 45
45#include <asm/system.h> 46#include <asm/system.h>
@@ -1293,7 +1294,7 @@ static void rr_dump(struct net_device *dev)
1293 1294
1294 printk("Error code 0x%x\n", readl(&regs->Fail1)); 1295 printk("Error code 0x%x\n", readl(&regs->Fail1));
1295 1296
1296 index = (((readl(&regs->EvtPrd) >> 8) & 0xff ) - 1) % EVT_RING_ENTRIES; 1297 index = (((readl(&regs->EvtPrd) >> 8) & 0xff) - 1) % TX_RING_ENTRIES;
1297 cons = rrpriv->dirty_tx; 1298 cons = rrpriv->dirty_tx;
1298 printk("TX ring index %i, TX consumer %i\n", 1299 printk("TX ring index %i, TX consumer %i\n",
1299 index, cons); 1300 index, cons);
@@ -1688,7 +1689,7 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1688 } 1689 }
1689} 1690}
1690 1691
1691static struct pci_device_id rr_pci_tbl[] = { 1692static DEFINE_PCI_DEVICE_TABLE(rr_pci_tbl) = {
1692 { PCI_VENDOR_ID_ESSENTIAL, PCI_DEVICE_ID_ESSENTIAL_ROADRUNNER, 1693 { PCI_VENDOR_ID_ESSENTIAL, PCI_DEVICE_ID_ESSENTIAL_ROADRUNNER,
1693 PCI_ANY_ID, PCI_ANY_ID, }, 1694 PCI_ANY_ID, PCI_ANY_ID, },
1694 { 0,} 1695 { 0,}