diff options
Diffstat (limited to 'drivers/net/pcnet32.c')
-rw-r--r-- | drivers/net/pcnet32.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index fc08c4af506c..d768f3d1ac28 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
@@ -309,12 +309,6 @@ static int pcnet32_alloc_ring(struct net_device *dev, char *name); | |||
309 | static void pcnet32_free_ring(struct net_device *dev); | 309 | static void pcnet32_free_ring(struct net_device *dev); |
310 | static void pcnet32_check_media(struct net_device *dev, int verbose); | 310 | static void pcnet32_check_media(struct net_device *dev, int verbose); |
311 | 311 | ||
312 | enum pci_flags_bit { | ||
313 | PCI_USES_IO = 1, PCI_USES_MEM = 2, PCI_USES_MASTER = 4, | ||
314 | PCI_ADDR0 = 0x10 << 0, PCI_ADDR1 = 0x10 << 1, PCI_ADDR2 = | ||
315 | 0x10 << 2, PCI_ADDR3 = 0x10 << 3, | ||
316 | }; | ||
317 | |||
318 | static u16 pcnet32_wio_read_csr(unsigned long addr, int index) | 312 | static u16 pcnet32_wio_read_csr(unsigned long addr, int index) |
319 | { | 313 | { |
320 | outw(index, addr + PCNET32_WIO_RAP); | 314 | outw(index, addr + PCNET32_WIO_RAP); |
@@ -1547,7 +1541,7 @@ static int pcnet32_open(struct net_device *dev) | |||
1547 | unsigned long flags; | 1541 | unsigned long flags; |
1548 | 1542 | ||
1549 | if (request_irq(dev->irq, &pcnet32_interrupt, | 1543 | if (request_irq(dev->irq, &pcnet32_interrupt, |
1550 | lp->shared_irq ? SA_SHIRQ : 0, dev->name, | 1544 | lp->shared_irq ? IRQF_SHARED : 0, dev->name, |
1551 | (void *)dev)) { | 1545 | (void *)dev)) { |
1552 | return -EAGAIN; | 1546 | return -EAGAIN; |
1553 | } | 1547 | } |