From e8d5a7221803a960fb05184b5da7a86b4d494069 Mon Sep 17 00:00:00 2001
From: Mike Smith <msmith@FreeBSD.org>
Date: Wed, 13 Dec 2000 01:11:34 +0000
Subject: [PATCH] Remove the COMPAT_OLDPCI option, it's going away.

Turn 'lnc' off in GENERIC for the moment, pending its update to newbus.
---
 sys/amd64/conf/GENERIC | 3 +--
 sys/conf/NOTES         | 1 -
 sys/i386/conf/GENERIC  | 3 +--
 sys/i386/conf/NOTES    | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index a8beb3077a6b..2afb33b3280d 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -66,7 +66,6 @@ device		isa
 device		eisa
 device		pci
 options 	COMPAT_OLDISA		# compatability shims for lnc, le
-options 	COMPAT_OLDPCI		# compatability shims for lnc
 
 # Floppy drives
 device		fdc
@@ -197,7 +196,7 @@ device		xe		# Xircom pccard ethernet
 # The probe order of these is presently determined by i386/isa/isa_compat.c.
 device		ie
 device		le
-device		lnc
+#device		lnc
 
 # Wireless NIC cards
 device		an		# Aironet 4500/4800 802.11 wireless NICs. 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 617d59bc1acc..60f1ed09b693 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1091,7 +1091,6 @@ device		pci
 # PCI options
 #
 #options 	PCI_QUIET	#quiets PCI code on chipset settings
-options 	COMPAT_OLDPCI	#Use PCI shims and glue for old drivers
 
 
 #####################################################################
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index a8beb3077a6b..2afb33b3280d 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -66,7 +66,6 @@ device		isa
 device		eisa
 device		pci
 options 	COMPAT_OLDISA		# compatability shims for lnc, le
-options 	COMPAT_OLDPCI		# compatability shims for lnc
 
 # Floppy drives
 device		fdc
@@ -197,7 +196,7 @@ device		xe		# Xircom pccard ethernet
 # The probe order of these is presently determined by i386/isa/isa_compat.c.
 device		ie
 device		le
-device		lnc
+#device		lnc
 
 # Wireless NIC cards
 device		an		# Aironet 4500/4800 802.11 wireless NICs. 
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 617d59bc1acc..60f1ed09b693 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1091,7 +1091,6 @@ device		pci
 # PCI options
 #
 #options 	PCI_QUIET	#quiets PCI code on chipset settings
-options 	COMPAT_OLDPCI	#Use PCI shims and glue for old drivers
 
 
 #####################################################################