factor out ie device definition; niklas@ ok

8 files changed, 14 insertions, 16 deletions

diff --git a/sys/arch/arm32/conf/files.arm32 b/sys/arch/arm32/conf/files.arm32
index ac8d54fa128..869f7688b8f 100644
--- a/sys/arch/arm32/conf/files.arm32
+++ b/sys/arch/arm32/conf/files.arm32
@@ -113,7 +113,6 @@ device eh: ether, ifnet
 attach eh at podulebus
 file	arch/arm32/podulebus/if_eh.c		eh
 
-device ie: ether, ifnet
 attach ie at podulebus
 file	arch/arm32/podulebus/if_ie.c		ie
 
diff --git a/sys/arch/mvme68k/conf/files.mvme68k b/sys/arch/mvme68k/conf/files.mvme68k
index 95d4a7c957b..47a586e084b 100644
--- a/sys/arch/mvme68k/conf/files.mvme68k
+++ b/sys/arch/mvme68k/conf/files.mvme68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mvme68k,v 1.9 1997/03/31 00:23:56 downsj Exp $
+#	$OpenBSD: files.mvme68k,v 1.10 1999/08/17 22:47:14 mickey Exp $
 
 # config file for mvme68k
 
@@ -40,7 +40,6 @@ file arch/mvme68k/dev/bug.c			bugtty
 attach	le at pcc
 file    arch/mvme68k/dev/if_le.c		le
 
-device ie: ifnet, ether
 attach ie at mc, pcctwo
 file    arch/mvme68k/dev/if_ie.c		ie
 
diff --git a/sys/arch/mvme88k/conf/files.mvme88k b/sys/arch/mvme88k/conf/files.mvme88k
index b739f0f14cd..809e2ab4e3e 100644
--- a/sys/arch/mvme88k/conf/files.mvme88k
+++ b/sys/arch/mvme88k/conf/files.mvme88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mvme88k,v 1.4 1999/05/29 04:41:42 smurph Exp $
+#	$OpenBSD: files.mvme88k,v 1.5 1999/08/17 22:47:15 mickey Exp $
 #	
 maxpartitions 16
 
@@ -100,7 +100,6 @@ file	arch/mvme88k/ddb/db_trace.c
 file	arch/mvme88k/dev/mainbus.c
 file	arch/mvme88k/dev/bugio.c
 
-device ie: ifnet, ether
 attach ie at pcctwo: ifnet, ether
 file    arch/mvme88k/dev/if_ie.c			ie
 
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index c82567d2d20..5b757ddf602 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc,v 1.31 1999/07/23 19:11:23 jason Exp $
+#	$OpenBSD: files.sparc,v 1.32 1999/08/17 22:47:15 mickey Exp $
 #	$NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
@@ -177,7 +177,6 @@ file	arch/sparc/dev/bt_subr.c	bt_dac
 attach le at sbus, ledma, lebuffer, obio
 file	arch/sparc/dev/if_le.c		le
 
-device ie: ifnet, ether
 attach ie at obio, vmes, vmel
 file	arch/sparc/dev/if_ie.c		ie
 
diff --git a/sys/arch/sun3/conf/files.sun3 b/sys/arch/sun3/conf/files.sun3
index f2f7934bac5..e3938ded039 100644
--- a/sys/arch/sun3/conf/files.sun3
+++ b/sys/arch/sun3/conf/files.sun3
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sun3,v 1.11 1997/08/19 11:48:10 kstailey Exp $
+#	$OpenBSD: files.sun3,v 1.12 1999/08/17 22:47:15 mickey Exp $
 #	$NetBSD: files.sun3,v 1.26 1996/10/29 19:58:14 gwr Exp $
 
 #
@@ -99,7 +99,6 @@ device intreg
 attach intreg at obio
 file arch/sun3/sun3/intreg.c		intreg
 
-device ie: ifnet, ether
 attach ie at obio with ie_obio
 attach ie at vmes with ie_vmes
 file arch/sun3/dev/if_ie_obio.c		ie_obio
diff --git a/sys/conf/files b/sys/conf/files
index 44b344ecb79..3926a86f1ab 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.126 1999/08/13 05:35:14 fgsch Exp $
+#	$OpenBSD: files,v 1.127 1999/08/17 22:47:16 mickey Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -112,6 +112,10 @@ file	dev/ic/smc91cxx.c	sm
 device	ne: ether, ifnet, dp8390nic, ifmedia
 file	dev/ic/ne2000.c		ne
 
+# Intel i82596/i82586 Ethernet Controller
+device	ie: ether, ifnet, ifmedia
+file	dev/ic/i82596.c		ie & (ie_pci | ie_eisa | ie_gsc)
+
 # 8250/16[45]50-based "com" ports
 device	com: tty
 file	dev/ic/com.c		com & (com_isa | com_commulti | com_pcmcia | com_pica | com_algor | com_gsc) needs-flag
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index ae7ea6c8910..e4fa4349931 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isa,v 1.61 1999/08/17 06:51:21 fgsch Exp $
+#	$OpenBSD: files.isa,v 1.62 1999/08/17 22:47:16 mickey Exp $
 #	$NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
 #
 # Config file and device description for machine-independent ISA code.
@@ -187,9 +187,8 @@ file	dev/isa/if_fe.c			fe
 
 # Intel i82586-based boards
 # (AT&T StarLAN 10, AT&T EN100, AT&T StarLAN Fiber, 3Com 3C507)
-device	ie: ether, ifnet, elink
-attach	ie at isa
-file	dev/isa/if_ie.c			ie
+attach	ie at isa with ie_isa: elink
+file	dev/isa/if_ie.c			ie_isa
 
 # Intel i82595-based boards.
 # (Intel EtherExpress PRO/100)
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index b4d8d5e68cb..4013b341185 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.17 1999/03/01 20:45:08 jason Exp $	*/
+/*	$OpenBSD: if_ie.c,v 1.18 1999/08/17 22:47:16 mickey Exp $	*/
 /*	$NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $	*/
 
 /*-
@@ -323,7 +323,7 @@ static __inline int ie_packet_len __P((struct ie_softc *));
 static void chan_attn_timeout __P((void *));
 static void run_tdr __P((struct ie_softc *, struct ie_tdr_cmd *));
 
-struct cfattach ie_ca = {
+struct cfattach ie_isa_ca = {
 	sizeof(struct ie_softc), ieprobe, ieattach
 };