summaryrefslogtreecommitdiffstats
path: root/drivers/net/pcnet32.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-28 04:15:50 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-28 04:15:50 +0200
commita39727f212426b9d5f9267b3318a2afaf9922d3b (patch)
treee42d5834dd5b0844552c076c1d264ab0e35396f6 /drivers/net/pcnet32.c
parentMerge git://git.infradead.org/mtd-2.6 (diff)
parent[netdrvr] Remove long-unused bits from Becker template drivers (diff)
downloadlinux-a39727f212426b9d5f9267b3318a2afaf9922d3b.tar.xz
linux-a39727f212426b9d5f9267b3318a2afaf9922d3b.zip
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [netdrvr] Remove long-unused bits from Becker template drivers [netdrvr] natsemi: minor cleanups [netdrvr] natsemi: Separate out media initialization code [PATCH] WAN: update info page for a bunch of my drivers [PATCH] drivers/net/hamradio/dmascc.c: fix section mismatch [PATCH] Fix phy id for LXT971A/LXT972A [PATCH] DM9000 - minor code cleanups [PATCH] DM9000 - do no re-init spin lock [PATCH] DM9000 - check for MAC left in by bootloader [PATCH] DM9000 - better checks for platform resources
Diffstat (limited to 'drivers/net/pcnet32.c')
-rw-r--r--drivers/net/pcnet32.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index fc08c4af506c..0e01c75da429 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);
static void pcnet32_free_ring(struct net_device *dev);
static void pcnet32_check_media(struct net_device *dev, int verbose);
-enum pci_flags_bit {
- PCI_USES_IO = 1, PCI_USES_MEM = 2, PCI_USES_MASTER = 4,
- PCI_ADDR0 = 0x10 << 0, PCI_ADDR1 = 0x10 << 1, PCI_ADDR2 =
- 0x10 << 2, PCI_ADDR3 = 0x10 << 3,
-};
-
static u16 pcnet32_wio_read_csr(unsigned long addr, int index)
{
outw(index, addr + PCNET32_WIO_RAP);