From ee42451e191f7dee17bb40e99b36e989e3f018d4 Mon Sep 17 00:00:00 2001
From: Nate Williams <nate@FreeBSD.org>
Date: Fri, 14 Jun 1996 21:41:48 +0000
Subject: [PATCH] Change the 'nep0' lines to 'ep0' since we are very soon to
 get a working if_ep.c driver for PCCARD stuff.  Also,change the 3C589
 examples to reflect what I use to switch between the two connectors.

---
 etc/defaults/pccard.conf | 18 +++++++++---------
 etc/pccard.conf.sample   | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index a9f9d09ce5fc..3971d2303664 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -8,7 +8,7 @@
 # IRQ == 0 means "allocate free IRQ from IRQ pool"
 # IRQ == 16 means "do not use IRQ (e.g. PIO mode)"
 #
-# $Id: pccard.conf.sample,v 1.1 1996/03/12 15:39:21 nate Exp $
+# $Id: pccard.conf.sample,v 1.2 1996/03/18 20:15:24 nate Exp $
 
 # Generally available IO ports
 io	0x240-0x360
@@ -47,21 +47,21 @@ card "ACCTON" "EN2212"
 
 # 3Com Etherlink III 3C589B, 3C589C
 card "3Com Corporation" "3C589"
-	config	0x1 "nep0" 11
+	config	0x1 "ep0" 11
 	insert	echo 3Com Etherlink III inserted
-	insert	/etc/pccard_ether nep0
-#	insert	/etc/pccard_ether nep0 link0
+	insert	/etc/pccard_ether ep0 -link0 link1
+#	insert	/etc/pccard_ether ep0 link0 -link1
 	remove	echo 3Com Etherlink III removed
-	remove	/sbin/ifconfig nep0 delete
+	remove	/sbin/ifconfig ep0 delete
 
 # Farallon EtherMac
 card "Farallon" "ENet"
-	config	0x1 "nep0" 11
+	config	0x1 "ep0" 11
 	insert	echo Farallon EtherMac inserted
-	insert	/etc/pccard_ether nep0
-#	insert	/etc/pccard_ether nep0 link0
+	insert	/etc/pccard_ether ep0
+#	insert	/etc/pccard_ether ep0 link0
 	remove	echo Farallon EtherMac removed
-	remove	/sbin/ifconfig nep0 delete
+	remove	/sbin/ifconfig ep0 delete
 
 # Fujitsu MBH10302
 card "PCMCIA MBH10302" "01"
diff --git a/etc/pccard.conf.sample b/etc/pccard.conf.sample
index a9f9d09ce5fc..3971d2303664 100644
--- a/etc/pccard.conf.sample
+++ b/etc/pccard.conf.sample
@@ -8,7 +8,7 @@
 # IRQ == 0 means "allocate free IRQ from IRQ pool"
 # IRQ == 16 means "do not use IRQ (e.g. PIO mode)"
 #
-# $Id: pccard.conf.sample,v 1.1 1996/03/12 15:39:21 nate Exp $
+# $Id: pccard.conf.sample,v 1.2 1996/03/18 20:15:24 nate Exp $
 
 # Generally available IO ports
 io	0x240-0x360
@@ -47,21 +47,21 @@ card "ACCTON" "EN2212"
 
 # 3Com Etherlink III 3C589B, 3C589C
 card "3Com Corporation" "3C589"
-	config	0x1 "nep0" 11
+	config	0x1 "ep0" 11
 	insert	echo 3Com Etherlink III inserted
-	insert	/etc/pccard_ether nep0
-#	insert	/etc/pccard_ether nep0 link0
+	insert	/etc/pccard_ether ep0 -link0 link1
+#	insert	/etc/pccard_ether ep0 link0 -link1
 	remove	echo 3Com Etherlink III removed
-	remove	/sbin/ifconfig nep0 delete
+	remove	/sbin/ifconfig ep0 delete
 
 # Farallon EtherMac
 card "Farallon" "ENet"
-	config	0x1 "nep0" 11
+	config	0x1 "ep0" 11
 	insert	echo Farallon EtherMac inserted
-	insert	/etc/pccard_ether nep0
-#	insert	/etc/pccard_ether nep0 link0
+	insert	/etc/pccard_ether ep0
+#	insert	/etc/pccard_ether ep0 link0
 	remove	echo Farallon EtherMac removed
-	remove	/sbin/ifconfig nep0 delete
+	remove	/sbin/ifconfig ep0 delete
 
 # Fujitsu MBH10302
 card "PCMCIA MBH10302" "01"