Module Name:    src
Committed By:   maxv
Date:           Thu Sep  6 05:36:51 UTC 2018

Modified Files:
        src/distrib/sets/lists/man: mi
        src/share/man/man4: Makefile
        src/sys/arch/algor/conf: P4032 P5064 P6032
        src/sys/arch/alpha/conf: GENERIC INSTALL RAWHIDE
        src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0
        src/sys/arch/arc/conf: GENERIC
        src/sys/arch/cats/conf: GENERIC INSTALL
        src/sys/arch/cobalt/conf: GENERIC INSTALL
        src/sys/arch/evbarm/conf: IXDP425 ZAO425
        src/sys/arch/evbmips/conf: MALTA
        src/sys/arch/evbppc/conf: PMPPC
        src/sys/arch/hppa/conf: GENERIC
        src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY
            INSTALL_TINY XEN3PAE_DOM0
        src/sys/arch/iyonix/conf: GENERIC
        src/sys/arch/sgimips/conf: GENERIC32_IP3x
        src/sys/arch/sparc/conf: GENERIC INSTALL
        src/sys/arch/sparc64/conf: GENERIC
        src/sys/conf: files
        src/sys/dev/pci: files.pci
        src/sys/dev/sbus: files.sbus
Removed Files:
        src/share/man/man4: en.4
        src/sys/dev/ic: midway.c midwayreg.h midwayvar.h
        src/sys/dev/pci: if_en_pci.c
        src/sys/dev/sbus: if_en.c

Log Message:
Retire the 'midway' driver. Discussed on tech-net@ recently and also three
years ago, part of removing the network ATM code.


To generate a diff of this commit:
cvs rdiff -u -r1.1612 -r1.1613 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.665 -r1.666 src/share/man/man4/Makefile
cvs rdiff -u -r1.8 -r0 src/share/man/man4/en.4
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/algor/conf/P4032
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/algor/conf/P5064
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/algor/conf/P6032
cvs rdiff -u -r1.385 -r1.386 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/alpha/conf/INSTALL
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/alpha/conf/RAWHIDE
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.504 -r1.505 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.156 -r1.157 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.190 -r1.191 src/sys/arch/arc/conf/GENERIC
cvs rdiff -u -r1.168 -r1.169 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/cats/conf/INSTALL
cvs rdiff -u -r1.159 -r1.160 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/cobalt/conf/INSTALL
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/conf/IXDP425
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/evbarm/conf/ZAO425
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/evbmips/conf/MALTA
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbppc/conf/PMPPC
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hppa/conf/GENERIC
cvs rdiff -u -r1.450 -r1.451 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1191 -r1.1192 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.159 -r1.160 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.157 -r1.158 src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/iyonix/conf/GENERIC
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/sgimips/conf/GENERIC32_IP3x
cvs rdiff -u -r1.260 -r1.261 src/sys/arch/sparc/conf/GENERIC
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/sparc/conf/INSTALL
cvs rdiff -u -r1.206 -r1.207 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.1204 -r1.1205 src/sys/conf/files
cvs rdiff -u -r1.103 -r0 src/sys/dev/ic/midway.c
cvs rdiff -u -r1.14 -r0 src/sys/dev/ic/midwayreg.h
cvs rdiff -u -r1.19 -r0 src/sys/dev/ic/midwayvar.h
cvs rdiff -u -r1.400 -r1.401 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.37 -r0 src/sys/dev/pci/if_en_pci.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/sbus/files.sbus
cvs rdiff -u -r1.29 -r0 src/sys/dev/sbus/if_en.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1612 src/distrib/sets/lists/man/mi:1.1613
--- src/distrib/sets/lists/man/mi:1.1612	Sat Aug 25 20:12:21 2018
+++ src/distrib/sets/lists/man/mi	Thu Sep  6 05:36:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1612 2018/08/25 20:12:21 rin Exp $
+# $NetBSD: mi,v 1.1613 2018/09/06 05:36:49 maxv Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -7131,7 +7131,7 @@
 ./usr/share/man/man4/emips/enic.4		man-sys-man		.man
 ./usr/share/man/man4/emips/intro.4		man-sys-man		.man
 ./usr/share/man/man4/emuxki.4			man-sys-man		.man
-./usr/share/man/man4/en.4			man-sys-man		.man
+./usr/share/man/man4/en.4			man-obsolete		obsolete
 ./usr/share/man/man4/envsys.4			man-sys-man		.man
 ./usr/share/man/man4/ep.4			man-sys-man		.man
 ./usr/share/man/man4/epic.4			man-sys-man		.man

Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.665 src/share/man/man4/Makefile:1.666
--- src/share/man/man4/Makefile:1.665	Sat Aug 25 20:12:21 2018
+++ src/share/man/man4/Makefile	Thu Sep  6 05:36:49 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.665 2018/08/25 20:12:21 rin Exp $
+#	$NetBSD: Makefile,v 1.666 2018/09/06 05:36:49 maxv Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 MAN=	aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -21,7 +21,7 @@ MAN=	aac.4 ac97.4 acardide.4 aceride.4 a
 	com.4 coram.4 crypto.4 cs80bus.4 cuda.4 cypide.4 cxdtv.4 \
 	ddb.4 ddc.4 de.4 dge.4 dk.4 dm.4 dmoverio.4 \
 	dmphy.4 dpt.4 dpti.4 drm.4 drum.4 drvctl.4 dtv.4 dtviic.4 dwctwo.4 \
-	eap.4 ebus.4 edc.4 elmc.4 emuxki.4 en.4 envsys.4 ep.4 esh.4 \
+	eap.4 ebus.4 edc.4 elmc.4 emuxki.4 envsys.4 ep.4 esh.4 \
 	esa.4 esiop.4 esm.4 eso.4 et.4 etphy.4 exphy.4 \
 	fd.4 filemon.4 finsio.4 flash.4 fpa.4 fms.4 fss.4 \
 	fujbp.4 full.4 fxp.4 \

Index: src/sys/arch/algor/conf/P4032
diff -u src/sys/arch/algor/conf/P4032:1.76 src/sys/arch/algor/conf/P4032:1.77
--- src/sys/arch/algor/conf/P4032:1.76	Sat Aug 25 20:52:40 2018
+++ src/sys/arch/algor/conf/P4032	Thu Sep  6 05:36:49 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: P4032,v 1.76 2018/08/25 20:52:40 rin Exp $
+#	$NetBSD: P4032,v 1.77 2018/09/06 05:36:49 maxv Exp $
 #
 # Algorithmics P-4032 kernel.
 #
@@ -7,7 +7,7 @@ include	"arch/algor/conf/std.algor"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"P4032-$Revision: 1.76 $"
+#ident 		"P4032-$Revision: 1.77 $"
 
 maxusers 32
 
@@ -130,7 +130,6 @@ pci*	at	vtpbc?
 #cz*	at	pci? dev ? function ?		# Cyclades-Z (untested)
 #dpt*	at	pci? dev ? function ?		# DPT SmartCache/SmartRAID
 #eap*	at	pci? dev ? function ?		# Ensoniq AudioPCI
-#en*	at	pci? dev ? function ?		# ENI PCI ATM (untested)
 #ep*	at	pci? dev ? function ?		# 3COM 3c59x
 #epic*	at	pci? dev ? function ?		# SMC EPIC/100 Ethernet
 #eso*	at	pci? dev ? function ?		# ESS Solo-1 PCI AudioDrive

Index: src/sys/arch/algor/conf/P5064
diff -u src/sys/arch/algor/conf/P5064:1.87 src/sys/arch/algor/conf/P5064:1.88
--- src/sys/arch/algor/conf/P5064:1.87	Sat Aug 25 20:52:40 2018
+++ src/sys/arch/algor/conf/P5064	Thu Sep  6 05:36:49 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: P5064,v 1.87 2018/08/25 20:52:40 rin Exp $
+#	$NetBSD: P5064,v 1.88 2018/09/06 05:36:49 maxv Exp $
 #
 # Algorithmics P-5064 kernel.
 #
@@ -7,7 +7,7 @@ include	"arch/algor/conf/std.algor"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"P5064-$Revision: 1.87 $"
+#ident 		"P5064-$Revision: 1.88 $"
 
 maxusers 32
 
@@ -126,7 +126,6 @@ pci*	at	vtpbc?
 #cz*	at	pci? dev ? function ?		# Cyclades-Z (untested)
 #dpt*	at	pci? dev ? function ?		# DPT SmartCache/SmartRAID
 #eap*	at	pci? dev ? function ?		# Ensoniq AudioPCI
-#en*	at	pci? dev ? function ?		# ENI PCI ATM (untested)
 #ep*	at	pci? dev ? function ?		# 3COM 3c59x
 #epic*	at	pci? dev ? function ?		# SMC EPIC/100 Ethernet
 #eso*	at	pci? dev ? function ?		# ESS Solo-1 PCI AudioDrive

Index: src/sys/arch/algor/conf/P6032
diff -u src/sys/arch/algor/conf/P6032:1.78 src/sys/arch/algor/conf/P6032:1.79
--- src/sys/arch/algor/conf/P6032:1.78	Sat Aug 25 20:52:40 2018
+++ src/sys/arch/algor/conf/P6032	Thu Sep  6 05:36:49 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: P6032,v 1.78 2018/08/25 20:52:40 rin Exp $
+#	$NetBSD: P6032,v 1.79 2018/09/06 05:36:49 maxv Exp $
 #
 # Algorithmics P-6032 kernel.
 #
@@ -7,7 +7,7 @@ include	"arch/algor/conf/std.algor"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"P6032-$Revision: 1.78 $"
+#ident 		"P6032-$Revision: 1.79 $"
 
 maxusers 32
 
@@ -118,7 +118,6 @@ pci*	at	bonito?
 #cz*	at	pci? dev ? function ?		# Cyclades-Z (untested)
 #dpt*	at	pci? dev ? function ?		# DPT SmartCache/SmartRAID
 #eap*	at	pci? dev ? function ?		# Ensoniq AudioPCI
-#en*	at	pci? dev ? function ?		# ENI PCI ATM (untested)
 #ep*	at	pci? dev ? function ?		# 3COM 3c59x
 #epic*	at	pci? dev ? function ?		# SMC EPIC/100 Ethernet
 #eso*	at	pci? dev ? function ?		# ESS Solo-1 PCI AudioDrive

Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.385 src/sys/arch/alpha/conf/GENERIC:1.386
--- src/sys/arch/alpha/conf/GENERIC:1.385	Sat Aug 25 20:52:40 2018
+++ src/sys/arch/alpha/conf/GENERIC	Thu Sep  6 05:36:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.385 2018/08/25 20:52:40 rin Exp $
+# $NetBSD: GENERIC,v 1.386 2018/09/06 05:36:49 maxv Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@ include 	"arch/alpha/conf/std.alpha"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident		"GENERIC-$Revision: 1.385 $"
+ident		"GENERIC-$Revision: 1.386 $"
 
 maxusers 32
 
@@ -304,7 +304,6 @@ cy*	at	pci? dev ? function ?		# Cyclades
 cz*	at	pci? dev ? function ?		# Cyclades-Z (untested)
 dpt*	at	pci? dev ? function ?		# DPT SmartCache/SmartRAID
 eap*	at	pci? dev ? function ?		# Ensoniq AudioPCI
-en*	at	pci? dev ? function ?		# ENI PCI ATM (untested)
 ep*	at	pci? dev ? function ?		# 3COM 3c59x/3c90x Ethernet
 epic*	at	pci? dev ? function ?		# SMC EPIC/100 Ethernet
 esh*	at	pci? dev ? function ?		# Essential HIPPI card

Index: src/sys/arch/alpha/conf/INSTALL
diff -u src/sys/arch/alpha/conf/INSTALL:1.110 src/sys/arch/alpha/conf/INSTALL:1.111
--- src/sys/arch/alpha/conf/INSTALL:1.110	Thu Sep 14 07:58:38 2017
+++ src/sys/arch/alpha/conf/INSTALL	Thu Sep  6 05:36:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.110 2017/09/14 07:58:38 mrg Exp $
+# $NetBSD: INSTALL,v 1.111 2018/09/06 05:36:49 maxv Exp $
 #
 # Alpha INSTALL kernel.
 
@@ -185,7 +185,6 @@ ahc*	at	pci? dev ? function ?		# Adaptec
 bha*	at	pci? dev ? function ?		# BusLogic 9xx SCSI (untested)
 cac*	at	pci? dev ? function ?		# Compaq array controller (untested)
 dpt*	at	pci? dev ? function ?		# DPT SmartCache/SmartRAID
-en*	at	pci? dev ? function ?		# ENI PCI ATM (untested)
 ep*	at	pci? dev ? function ?		# 3COM 3c59x/3c90x Ethernet
 epic*	at	pci? dev ? function ?		# SMC EPIC/100 Ethernet
 ex*	at	pci? dev ? function ?		# 3COM 3c90x[BC] Ethernet

Index: src/sys/arch/alpha/conf/RAWHIDE
diff -u src/sys/arch/alpha/conf/RAWHIDE:1.42 src/sys/arch/alpha/conf/RAWHIDE:1.43
--- src/sys/arch/alpha/conf/RAWHIDE:1.42	Wed Aug  1 20:04:09 2018
+++ src/sys/arch/alpha/conf/RAWHIDE	Thu Sep  6 05:36:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: RAWHIDE,v 1.42 2018/08/01 20:04:09 maxv Exp $
+# $NetBSD: RAWHIDE,v 1.43 2018/09/06 05:36:49 maxv Exp $
 #
 # Alpha 4100 stripped for action server kernel.
 #
@@ -59,7 +59,6 @@ pci*	at	mcpcia?
 ahc*	at	pci? dev ? function ?		# Adaptec [23]94x, aic78x0 SCSI
 bha*	at	pci? dev ? function ?		# BusLogic 9xx SCSI (untested)
 cy*	at	pci? dev ? function ?		# Cyclades Cyclom-Y (untested)
-en*	at	pci? dev ? function ?		# ENI PCI ATM (untested)
 ep*	at	pci? dev ? function ?		# 3COM 3c59x/3c90x Ethernet
 esh*	at	pci? dev ? function ?		# Essential HIPPI card
 fpa*	at	pci? dev ? function ?		# DEC DEFPA FDDI

Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.100 src/sys/arch/amd64/conf/ALL:1.101
--- src/sys/arch/amd64/conf/ALL:1.100	Mon Aug 27 16:30:51 2018
+++ src/sys/arch/amd64/conf/ALL	Thu Sep  6 05:36:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.100 2018/08/27 16:30:51 riastradh Exp $
+# $NetBSD: ALL,v 1.101 2018/09/06 05:36:49 maxv Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.100 $"
+#ident		"ALL-$Revision: 1.101 $"
 
 maxusers	64		# estimated number of users
 
@@ -951,7 +951,6 @@ bnx*	at pci? dev ? function ?	# Broadcom
 bwi*	at pci? dev ? function ?	# Broadcom BCM43xx wireless
 cas*	at pci? dev ? function ?	# Sun Cassini/Cassini+ Ethernet
 dge*	at pci? dev ? function ?	# Intel 82597 10GbE LR
-en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ena*	at pci? dev ? function ?	# NOT WORKING - Amazon Elastic Network Adapter
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet

Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.504 src/sys/arch/amd64/conf/GENERIC:1.505
--- src/sys/arch/amd64/conf/GENERIC:1.504	Mon Aug 20 15:04:51 2018
+++ src/sys/arch/amd64/conf/GENERIC	Thu Sep  6 05:36:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.504 2018/08/20 15:04:51 maxv Exp $
+# $NetBSD: GENERIC,v 1.505 2018/09/06 05:36:49 maxv Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.504 $"
+#ident		"GENERIC-$Revision: 1.505 $"
 
 maxusers	64		# estimated number of users
 
@@ -770,7 +770,6 @@ bnx*	at pci? dev ? function ?	# Broadcom
 bwi*	at pci? dev ? function ?	# Broadcom BCM43xx wireless
 bwfm*	at pci? dev ? function ?	# Broadcom FullMAC
 dge*	at pci? dev ? function ?	# Intel 82597 10GbE LR
-en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 esh*	at pci? dev ? function ?	# Essential HIPPI card

Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.156 src/sys/arch/amd64/conf/XEN3_DOM0:1.157
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.156	Sat Aug 25 20:52:40 2018
+++ src/sys/arch/amd64/conf/XEN3_DOM0	Thu Sep  6 05:36:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.156 2018/08/25 20:52:40 rin Exp $
+# $NetBSD: XEN3_DOM0,v 1.157 2018/09/06 05:36:49 maxv Exp $
 
 include 	"arch/amd64/conf/std.xen"
 
@@ -10,7 +10,7 @@ options 	INCLUDE_CONFIG_FILE	# embed con
 #options 	UVMHIST_PRINT
 #options 	SYSCALL_DEBUG
 
-#ident		"XEN3_DOM0-$Revision: 1.156 $"
+#ident		"XEN3_DOM0-$Revision: 1.157 $"
 
 maxusers	32		# estimated number of users
 
@@ -354,7 +354,6 @@ bce*	at pci? dev ? function ?	# Broadcom
 bge*	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
 bnx*	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
 dge*	at pci? dev ? function ?	# Intel 82597 10GbE LR
-en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 esh*	at pci? dev ? function ?	# Essential HIPPI card

Index: src/sys/arch/arc/conf/GENERIC
diff -u src/sys/arch/arc/conf/GENERIC:1.190 src/sys/arch/arc/conf/GENERIC:1.191
--- src/sys/arch/arc/conf/GENERIC:1.190	Wed Aug  1 20:04:10 2018
+++ src/sys/arch/arc/conf/GENERIC	Thu Sep  6 05:36:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.190 2018/08/01 20:04:10 maxv Exp $
+# $NetBSD: GENERIC,v 1.191 2018/09/06 05:36:49 maxv Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/arc/conf/std.arc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.190 $"
+#ident		"GENERIC-$Revision: 1.191 $"
 
 maxusers	32		# estimated number of users
 
@@ -317,7 +317,6 @@ viaide* 	at pci? dev ? function ?	# VIA/
 # PCI network devices
 #an*		at pci? dev ? function ?	# Aironet PC4500/PC4800 (802.11)
 bge*		at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
-#en*		at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*		at pci? dev ? function ?	# 3Com 3c59x
 epic*		at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 #esh*		at pci? dev ? function ?	# Essential HIPPI card

Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.168 src/sys/arch/cats/conf/GENERIC:1.169
--- src/sys/arch/cats/conf/GENERIC:1.168	Sat Aug 25 20:52:40 2018
+++ src/sys/arch/cats/conf/GENERIC	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.168 2018/08/25 20:52:40 rin Exp $
+# $NetBSD: GENERIC,v 1.169 2018/09/06 05:36:50 maxv Exp $
 #
 # GENERIC machine description file
 # 
@@ -285,7 +285,6 @@ sd*	at atapibus? drive ? flags 0x0000	# 
 uk*	at atapibus? drive ? flags 0x0000	# ATAPI unknown
 
 # PCI network interfaces
-#en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*	at pci? dev ? function ?	# 3C590 ethernet cards
 ex*	at pci? dev ? function ?	# 3Com 90x[B]
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet

Index: src/sys/arch/cats/conf/INSTALL
diff -u src/sys/arch/cats/conf/INSTALL:1.105 src/sys/arch/cats/conf/INSTALL:1.106
--- src/sys/arch/cats/conf/INSTALL:1.105	Sat Aug 25 20:52:40 2018
+++ src/sys/arch/cats/conf/INSTALL	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.105 2018/08/25 20:52:40 rin Exp $
+#	$NetBSD: INSTALL,v 1.106 2018/09/06 05:36:50 maxv Exp $
 #
 #	CATSINST -- CHALTECH CATS Install kernel
 #
@@ -231,7 +231,6 @@ sd*	at atapibus? drive ? flags 0x0000	# 
 #uk*	at atapibus? drive ? flags 0x0000	# ATAPI unknown
 
 # PCI network interfaces
-#en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*	at pci? dev ? function ?	# 3C590 ethernet cards
 ex*	at pci? dev ? function ?	# 3Com 90x[B]
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet

Index: src/sys/arch/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.159 src/sys/arch/cobalt/conf/GENERIC:1.160
--- src/sys/arch/cobalt/conf/GENERIC:1.159	Wed Aug  1 20:04:10 2018
+++ src/sys/arch/cobalt/conf/GENERIC	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.159 2018/08/01 20:04:10 maxv Exp $
+# $NetBSD: GENERIC,v 1.160 2018/09/06 05:36:50 maxv Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.159 $"
+#ident 		"GENERIC-$Revision: 1.160 $"
 
 maxusers	32
 
@@ -235,7 +235,6 @@ atabus* 	at ata?
 wd* 		at atabus? drive ? flags 0x0000
 
 # PCI network interfaces
-#en*		at pci? dev ? function ?	# ENI/Adaptec ATM
 #ep*		at pci? dev ? function ?	# 3Com 3c59x
 #ex*		at pci? dev ? function ?	# 3Com 90x[BC]
 #epic*		at pci? dev ? function ?	# SMC EPIC/100 Ethernet

Index: src/sys/arch/cobalt/conf/INSTALL
diff -u src/sys/arch/cobalt/conf/INSTALL:1.68 src/sys/arch/cobalt/conf/INSTALL:1.69
--- src/sys/arch/cobalt/conf/INSTALL:1.68	Wed Aug  1 20:04:10 2018
+++ src/sys/arch/cobalt/conf/INSTALL	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.68 2018/08/01 20:04:10 maxv Exp $
+# $NetBSD: INSTALL,v 1.69 2018/09/06 05:36:50 maxv Exp $
 #
 # INSTALL -- installation and rescue kernel.
 #
@@ -10,7 +10,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"INSTALL-$Revision: 1.68 $"
+#ident 		"INSTALL-$Revision: 1.69 $"
 
 makeoptions     COPTS="-Os -mmemcpy"
 makeoptions	CPUFLAGS="-march=vr5000 -mabi=32"
@@ -225,7 +225,6 @@ atabus* 	at ata?
 wd* 		at atabus? drive ? flags 0x0000
 
 # PCI network interfaces
-#en*		at pci? dev ? function ?	# ENI/Adaptec ATM
 #ep*		at pci? dev ? function ?	# 3Com 3c59x
 #ex*		at pci? dev ? function ?	# 3Com 90x[BC]
 #epic*		at pci? dev ? function ?	# SMC EPIC/100 Ethernet

Index: src/sys/arch/evbarm/conf/IXDP425
diff -u src/sys/arch/evbarm/conf/IXDP425:1.54 src/sys/arch/evbarm/conf/IXDP425:1.55
--- src/sys/arch/evbarm/conf/IXDP425:1.54	Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/IXDP425	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: IXDP425,v 1.54 2018/07/12 10:46:43 maxv Exp $
+#	$NetBSD: IXDP425,v 1.55 2018/09/06 05:36:50 maxv Exp $
 #
 #	IXDP425 -- Intel IXDP425/IXCDP1100 Development Platform
 #
@@ -166,7 +166,6 @@ pci0		at ixpio? bus ?
 #
 an*	at pci? dev ? function ?	# Aironet PC4500/PC4800 (802.11)
 bge*	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
-en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 esh*	at pci? dev ? function ?	# Essential HIPPI card

Index: src/sys/arch/evbarm/conf/ZAO425
diff -u src/sys/arch/evbarm/conf/ZAO425:1.62 src/sys/arch/evbarm/conf/ZAO425:1.63
--- src/sys/arch/evbarm/conf/ZAO425:1.62	Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/ZAO425	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: ZAO425,v 1.62 2018/07/12 10:46:43 maxv Exp $
+#	$NetBSD: ZAO425,v 1.63 2018/09/06 05:36:50 maxv Exp $
 #
 #	ZAO425 -- Intel IXP425
 #
@@ -153,7 +153,6 @@ pci0		at ixpio? bus ?
 #
 an*	at pci? dev ? function ?	# Aironet PC4500/PC4800 (802.11)
 bge*	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
-en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 esh*	at pci? dev ? function ?	# Essential HIPPI card

Index: src/sys/arch/evbmips/conf/MALTA
diff -u src/sys/arch/evbmips/conf/MALTA:1.90 src/sys/arch/evbmips/conf/MALTA:1.91
--- src/sys/arch/evbmips/conf/MALTA:1.90	Wed Aug  1 20:04:11 2018
+++ src/sys/arch/evbmips/conf/MALTA	Thu Sep  6 05:36:50 2018
@@ -1,10 +1,10 @@
-#	$NetBSD: MALTA,v 1.90 2018/08/01 20:04:11 maxv Exp $
+#	$NetBSD: MALTA,v 1.91 2018/09/06 05:36:50 maxv Exp $
 
 include 	"arch/evbmips/conf/std.malta"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"MALTA-$Revision: 1.90 $"
+#ident 		"MALTA-$Revision: 1.91 $"
 
 maxusers	32
 
@@ -210,7 +210,6 @@ wd* 		at atabus? drive ? flags 0x0000
 
 # PCI network interfaces
 ath*		at pci? dev ? function ?	# Atheros WLAN 
-#en*		at pci? dev ? function ?	# ENI/Adaptec ATM
 #ep*		at pci? dev ? function ?	# 3Com 3c59x
 #ex*		at pci? dev ? function ?	# 3Com 90x[B]
 #epic*		at pci? dev ? function ?	# SMC EPIC/100 Ethernet

Index: src/sys/arch/evbppc/conf/PMPPC
diff -u src/sys/arch/evbppc/conf/PMPPC:1.44 src/sys/arch/evbppc/conf/PMPPC:1.45
--- src/sys/arch/evbppc/conf/PMPPC:1.44	Sat Aug 25 20:52:41 2018
+++ src/sys/arch/evbppc/conf/PMPPC	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: PMPPC,v 1.44 2018/08/25 20:52:41 rin Exp $
+#	$NetBSD: PMPPC,v 1.45 2018/09/06 05:36:50 maxv Exp $
 #
 #	PMPPC
 #
@@ -222,7 +222,6 @@ icpsp*	at icp? unit ?			# SCSI pass-thro
 
 # PCI network interfaces
 an*	at pci? dev ? function ?	# Aironet PC4500/PC4800 (802.11)
-en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 esh*	at pci? dev ? function ?	# Essential HIPPI card

Index: src/sys/arch/hppa/conf/GENERIC
diff -u src/sys/arch/hppa/conf/GENERIC:1.20 src/sys/arch/hppa/conf/GENERIC:1.21
--- src/sys/arch/hppa/conf/GENERIC:1.20	Sat Aug 25 20:52:41 2018
+++ src/sys/arch/hppa/conf/GENERIC	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.20 2018/08/25 20:52:41 rin Exp $
+# $NetBSD: GENERIC,v 1.21 2018/09/06 05:36:50 maxv Exp $
 #
 # GENERIC machine description file
 #
@@ -23,7 +23,7 @@ include 	"arch/hppa/conf/std.hppa"
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 
-#ident 		"GENERIC-$Revision: 1.20 $"
+#ident 		"GENERIC-$Revision: 1.21 $"
 
 maxusers	32		# estimated number of users
 
@@ -463,8 +463,6 @@ an*	at pci? dev ? function ?	# Aironet P
 atw*	at pci? dev ? function ?	# ADMtek ADM8211 (802.11)
 bce* 	at pci? dev ? function ?	# Broadcom 4401 10/100 Ethernet
 bge* 	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
-# en is broken, uses vtophys
-#en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 esh*	at pci? dev ? function ?	# Essential HIPPI card

Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.450 src/sys/arch/i386/conf/ALL:1.451
--- src/sys/arch/i386/conf/ALL:1.450	Mon Aug 27 16:29:18 2018
+++ src/sys/arch/i386/conf/ALL	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.450 2018/08/27 16:29:18 riastradh Exp $
+# $NetBSD: ALL,v 1.451 2018/09/06 05:36:50 maxv Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.450 $"
+#ident		"ALL-$Revision: 1.451 $"
 
 maxusers	64		# estimated number of users
 
@@ -1044,7 +1044,6 @@ bnx*	at pci? dev ? function ?	# Broadcom
 bwi*	at pci? dev ? function ?	# Broadcom BCM43xx wireless
 cas*	at pci? dev ? function ?	# Sun Cassini/Cassini+ Ethernet
 dge*	at pci? dev ? function ?	# Intel 82597 10GbE LR
-en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 esh*	at pci? dev ? function ?	# Essential HIPPI card

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1191 src/sys/arch/i386/conf/GENERIC:1.1192
--- src/sys/arch/i386/conf/GENERIC:1.1191	Sat Aug 25 07:48:56 2018
+++ src/sys/arch/i386/conf/GENERIC	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1191 2018/08/25 07:48:56 maxv Exp $
+# $NetBSD: GENERIC,v 1.1192 2018/09/06 05:36:50 maxv Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.1191 $"
+#ident		"GENERIC-$Revision: 1.1192 $"
 
 maxusers	64		# estimated number of users
 
@@ -976,7 +976,6 @@ bge*	at pci? dev ? function ?	# Broadcom
 bnx*	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
 bwi*	at pci? dev ? function ?	# Broadcom BCM43xx wireless
 dge*	at pci? dev ? function ?	# Intel 82597 10GbE LR
-en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 esh*	at pci? dev ? function ?	# Essential HIPPI card

Index: src/sys/arch/i386/conf/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.159 src/sys/arch/i386/conf/GENERIC_TINY:1.160
--- src/sys/arch/i386/conf/GENERIC_TINY:1.159	Sat Aug 25 20:52:41 2018
+++ src/sys/arch/i386/conf/GENERIC_TINY	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_TINY,v 1.159 2018/08/25 20:52:41 rin Exp $
+#	$NetBSD: GENERIC_TINY,v 1.160 2018/09/06 05:36:50 maxv Exp $
 #
 #	GENERIC_TINY -- suitable default for 4M machines
 #			No EISA, PCI, or SCSI.
@@ -363,7 +363,6 @@ fd*	at fdc? drive ?			# the drives thems
 # Network Interfaces
 
 # PCI network interfaces
-#en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 #ep*	at pci? dev ? function ?	# 3Com 3c59x/3c90x Ethernet
 #epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 #esh*	at pci? dev ? function ?	# Essential HIPPI card

Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.45 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.46
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.45	Sat Aug 25 20:52:41 2018
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_FLOPPY,v 1.45 2018/08/25 20:52:41 rin Exp $
+#	$NetBSD: INSTALL_FLOPPY,v 1.46 2018/09/06 05:36:50 maxv Exp $
 #
 #	INSTALL - Installation kernel.
 #
@@ -479,7 +479,6 @@ atw*	at pci? dev ? function ?	# ADMtek A
 bce*	at pci? dev ? function ?	# Broadcom 4401 10/100 Ethernet
 bge*	at pci? dev ? function ?	# Broadcom 570x Gigabit Ethernet
 # bnx*	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
-#en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 ex*	at pci? dev ? function ?	# 3Com 3c90x[BC]
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet

Index: src/sys/arch/i386/conf/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.157 src/sys/arch/i386/conf/INSTALL_TINY:1.158
--- src/sys/arch/i386/conf/INSTALL_TINY:1.157	Wed Aug  1 16:59:10 2018
+++ src/sys/arch/i386/conf/INSTALL_TINY	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_TINY,v 1.157 2018/08/01 16:59:10 maxv Exp $
+#	$NetBSD: INSTALL_TINY,v 1.158 2018/09/06 05:36:50 maxv Exp $
 #
 #	This kernel should be derived from INSTALL (which is derived
 #	from GENERIC) with some features commented out.
@@ -380,7 +380,6 @@ fd*	at fdc? drive ?			# the drives thems
 # Network Interfaces
 
 # PCI network interfaces
-#en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 #ep*	at pci? dev ? function ?	# 3Com 3c59x/3c90x Ethernet
 #fpa*	at pci? dev ? function ?	# DEC DEFPA FDDI
 #fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B

Index: src/sys/arch/i386/conf/XEN3PAE_DOM0
diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.5 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.6
--- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.5	Sat Aug 25 20:52:41 2018
+++ src/sys/arch/i386/conf/XEN3PAE_DOM0	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: XEN3PAE_DOM0,v 1.5 2018/08/25 20:52:41 rin Exp $
+#	$NetBSD: XEN3PAE_DOM0,v 1.6 2018/09/06 05:36:50 maxv Exp $
 #
 #	XEN3_0: Xen 3.0 domain0 kernel
 
@@ -318,7 +318,6 @@ bce*	at pci? dev ? function ?	# Broadcom
 bge*	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
 bnx*	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
 dge*	at pci? dev ? function ?	# Intel 82597 10GbE LR
-en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 esh*	at pci? dev ? function ?	# Essential HIPPI card

Index: src/sys/arch/iyonix/conf/GENERIC
diff -u src/sys/arch/iyonix/conf/GENERIC:1.101 src/sys/arch/iyonix/conf/GENERIC:1.102
--- src/sys/arch/iyonix/conf/GENERIC:1.101	Sat Aug 25 20:52:41 2018
+++ src/sys/arch/iyonix/conf/GENERIC	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.101 2018/08/25 20:52:41 rin Exp $
+#	$NetBSD: GENERIC,v 1.102 2018/09/06 05:36:50 maxv Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/iyonix/conf/std.iyonix"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.101 $"
+#ident 		"GENERIC-$Revision: 1.102 $"
 
 maxusers	32		# estimated number of users
 
@@ -382,7 +382,6 @@ uk*	at atapibus? drive ? flags 0x0000	# 
 #bge* 	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
 #bnx* 	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
 #dge*	at pci? dev ? function ?	# Intel 82597 10GbE LR
-#en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 #ep*	at pci? dev ? function ?	# 3Com 3c59x
 #epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 #esh*	at pci? dev ? function ?	# Essential HIPPI card

Index: src/sys/arch/sgimips/conf/GENERIC32_IP3x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.118 src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.119
--- src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.118	Sat Aug 25 20:52:42 2018
+++ src/sys/arch/sgimips/conf/GENERIC32_IP3x	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC32_IP3x,v 1.118 2018/08/25 20:52:42 rin Exp $
+#	$NetBSD: GENERIC32_IP3x,v 1.119 2018/09/06 05:36:50 maxv Exp $
 #
 # GENERIC32_IP3x machine description file
 # 
@@ -28,7 +28,7 @@ makeoptions	TEXTADDR="0x80069000"	# entr
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC32_IP3x-$Revision: 1.118 $"
+#ident		"GENERIC32_IP3x-$Revision: 1.119 $"
 
 maxusers	32
 
@@ -198,7 +198,6 @@ ubsec*	at pci? dev ? function ?	# Broadc
 # PCI network devices
 #an*     at pci? dev ? function ?        # Aironet PC4500/PC4800 (802.11)
 #bge*    at pci? dev ? function ?        # Broadcom 570x gigabit Ethernet
-#en*     at pci? dev ? function ?        # ENI/Adaptec ATM
 ep*     at pci? dev ? function ?        # 3Com 3c59x
 epic*   at pci? dev ? function ?        # SMC EPIC/100 Ethernet
 esh*    at pci? dev ? function ?        # Essential HIPPI card

Index: src/sys/arch/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.260 src/sys/arch/sparc/conf/GENERIC:1.261
--- src/sys/arch/sparc/conf/GENERIC:1.260	Wed Aug  1 20:04:14 2018
+++ src/sys/arch/sparc/conf/GENERIC	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.260 2018/08/01 20:04:14 maxv Exp $
+# $NetBSD: GENERIC,v 1.261 2018/09/06 05:36:50 maxv Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/sparc/conf/std.sparc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.260 $"
+#ident 		"GENERIC-$Revision: 1.261 $"
 
 maxusers	32
 
@@ -531,9 +531,6 @@ qe*	at qec?					# Mace Ethernet (10MBd)
 ## Happy Meal Ethernet
 hme*	at sbus? slot ? offset ?
 
-# midway ATM
-en0	at sbus? slot ? offset ?
-
 # PCMCIA ethernet devices
 #ep*	at pcmcia?
 #mbe*	at pcmcia?

Index: src/sys/arch/sparc/conf/INSTALL
diff -u src/sys/arch/sparc/conf/INSTALL:1.100 src/sys/arch/sparc/conf/INSTALL:1.101
--- src/sys/arch/sparc/conf/INSTALL:1.100	Wed Aug  1 20:04:14 2018
+++ src/sys/arch/sparc/conf/INSTALL	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.100 2018/08/01 20:04:14 maxv Exp $
+#	$NetBSD: INSTALL,v 1.101 2018/09/06 05:36:50 maxv Exp $
 #
 # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
 #
@@ -434,9 +434,6 @@ qec*		at sbus? slot ? offset ?
 be*		at qec?
 qe*		at qec?
 
-# midway ATM
-en0	at sbus? slot ? offset ?
-
 # PCMCIA ethernet devices
 #ep*	at pcmcia?
 #mbe*	at pcmcia?

Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.206 src/sys/arch/sparc64/conf/GENERIC:1.207
--- src/sys/arch/sparc64/conf/GENERIC:1.206	Sat Aug 25 20:52:42 2018
+++ src/sys/arch/sparc64/conf/GENERIC	Thu Sep  6 05:36:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.206 2018/08/25 20:52:42 rin Exp $
+# $NetBSD: GENERIC,v 1.207 2018/09/06 05:36:50 maxv Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/sparc64/conf/std.sparc64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.206 $"
+#ident		"GENERIC-$Revision: 1.207 $"
 
 maxusers	64
 
@@ -493,7 +493,6 @@ ath*	at pci? dev ? function ?	# Atheros 
 bge*	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
 bnx*	at pci? dev ? function ?	# Broadcom NetXtreme II Ethernet
 cas*	at pci? dev ? function ?	# Sun Cassini/Cassini+ Ethernet
-en*	at pci? dev ? function ?	# ENI/Adaptec ATM UT
 # XXX causes ICE
 #ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1204 src/sys/conf/files:1.1205
--- src/sys/conf/files:1.1204	Mon Aug 20 15:04:52 2018
+++ src/sys/conf/files	Thu Sep  6 05:36:51 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1204 2018/08/20 15:04:52 maxv Exp $
+#	$NetBSD: files,v 1.1205 2018/09/06 05:36:51 maxv Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20171118
@@ -780,11 +780,6 @@ file	dev/ic/pdq_ifsubr.c		pdq
 device	cy: tty
 file	dev/ic/cy.c			cy			needs-flag
 
-# Efficient Networks, Inc. ATM interface
-#
-device	en: atm, ifnet
-file	dev/ic/midway.c			en
-
 # NCR 53x9x or Emulex ESP SCSI Controller
 #
 define	ncr53c9x

Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.400 src/sys/dev/pci/files.pci:1.401
--- src/sys/dev/pci/files.pci:1.400	Sat Aug 25 07:48:57 2018
+++ src/sys/dev/pci/files.pci	Thu Sep  6 05:36:51 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files.pci,v 1.400 2018/08/25 07:48:57 maxv Exp $
+#	$NetBSD: files.pci,v 1.401 2018/09/06 05:36:51 maxv Exp $
 #
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -167,11 +167,6 @@ device	de: ether, ifnet, arp
 attach	de at pci
 file	dev/pci/if_de.c			de
 
-# Efficient Networks, Inc. ATM interface
-# device declaration in sys/conf/files
-attach	en at pci with en_pci
-file	dev/pci/if_en_pci.c		en_pci
-
 # 3Com 3c590 and 3c595 Ethernet controllers
 # device declaration in sys/conf/files
 attach	ep at pci with ep_pci

Index: src/sys/dev/sbus/files.sbus
diff -u src/sys/dev/sbus/files.sbus:1.42 src/sys/dev/sbus/files.sbus:1.43
--- src/sys/dev/sbus/files.sbus:1.42	Thu Feb 11 02:23:44 2016
+++ src/sys/dev/sbus/files.sbus	Thu Sep  6 05:36:51 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files.sbus,v 1.42 2016/02/11 02:23:44 macallan Exp $
+#	$NetBSD: files.sbus,v 1.43 2018/09/06 05:36:51 maxv Exp $
 #
 # Config file and device description for machine-independent SBUS code.
 # Included by ports that need it.
@@ -45,11 +45,6 @@ device	bpp {}: lsi64854
 attach	bpp at sbus
 file	dev/sbus/bpp.c			bpp	needs-flag
 
-# Efficient Networks, Inc. ATM interface
-# device declaration in sys/conf/files
-attach	en at sbus with en_sbus
-file	dev/sbus/if_en.c		en_sbus
-
 device	qec {}
 attach	qec at sbus
 file	dev/sbus/qec.c			qec

Reply via email to