From aafeeedf584e1897157f7226fc5867a02a98af35 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Mon, 29 Apr 2002 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2002-04-29

---
 pc/ether8139.c | 6 +++---
 pc/etherec2t.c | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pc/ether8139.c b/pc/ether8139.c
index 57bba1355c440c5cfd12f5965834ed5197c9831e..f83efd94e98bfd47cf4eba786a3de30ee3c54562 100644
--- a/pc/ether8139.c
+++ b/pc/ether8139.c
@@ -73,7 +73,7 @@ enum {					/* Imr/Isr */
 	PunLc		= 0x0020,	/* Packet Underrun or Link Change */
 	Fovw		= 0x0040,	/* Receive FIFO Overflow */
 	Clc		= 0x2000,	/* Cable Length Change */
-	Timer		= 0x4000,	/* Timer */
+	Timerbit		= 0x4000,	/* Timer */
 	Serr		= 0x8000,	/* System Error */
 };
 
@@ -352,7 +352,7 @@ rtl8139init(Ether* edev)
 	 * Interrupts.
 	 */
 	csr32w(ctlr, TimerInt, 0);
-	csr16w(ctlr, Imr, Serr|Timer|Fovw|PunLc|Rxovw|Ter|Tok|Rer|Rok);
+	csr16w(ctlr, Imr, Serr|Timerbit|Fovw|PunLc|Rxovw|Ter|Tok|Rer|Rok);
 	csr32w(ctlr, Mpc, 0);
 
 	/*
@@ -585,7 +585,7 @@ rtl8139interrupt(Ureg*, void* arg)
 		if(isr != 0){
 			iprint("rtl8139interrupt: imr %4.4uX isr %4.4uX\n",
 				csr16r(ctlr, Imr), isr);
-			if(isr & Timer)
+			if(isr & Timerbit)
 				csr32w(ctlr, TimerInt, 0);
 			if(isr & Serr)
 				rtl8139init(edev);
diff --git a/pc/etherec2t.c b/pc/etherec2t.c
index 76187165bee2b5e58aa8ea0674d5e3b5d3117b28..9307c8f55bcf58f3ca5643f162cd1e31134aa5c4 100644
--- a/pc/etherec2t.c
+++ b/pc/etherec2t.c
@@ -26,6 +26,7 @@ typedef struct Ec2t {
 static Ec2t ec2tpcmcia[] = {
 	{ "EC2T", 0, },			/* Linksys Combo PCMCIA EthernetCard */
 	{ "PCMPC100", 1, },		/* EtherFast 10/100 PC Card */
+	{ "PCM100", 1, },	/* EtherFast PCM100 Card */
 	{ "EN2216", 0, },		/* Accton EtherPair-PCMCIA */
 	{ "FA410TX", 1, },		/* Netgear FA410TX */
 	{ "Network Everywhere", 0, },	/* Linksys NP10T 10BaseT Card */