git: b42a2ea5589f - main - Remove ndis(4) remnants from kernel configs

[Mateusz Guzik]

The branch main has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=b42a2ea5589f86911643b3ce1ebeace5d1e2c1eb

commit b42a2ea5589f86911643b3ce1ebeace5d1e2c1eb
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-01-26 00:04:13 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
CommitDate: 2021-01-26 00:04:13 +0000

    Remove ndis(4) remnants from kernel configs
    
    Unbreaks LINT kernels.
---
 sys/amd64/conf/NOTES   | 5 -----
 sys/conf/options.amd64 | 1 -
 sys/conf/options.i386  | 1 -
 sys/i386/conf/NOTES    | 4 ----
 4 files changed, 11 deletions(-)

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 1b949fc24c8e..a1691f66a4cb 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -684,11 +684,6 @@ options 	VM_KMEM_SIZE
 options 	VM_KMEM_SIZE_MAX
 options 	VM_KMEM_SIZE_SCALE
 
-# Enable NDIS binary driver support
-options 	NDISAPI
-device		ndis
-
-
 # GCOV (code coverage) support
 
 options		LINDEBUGFS
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index cd90747ba732..05b295647b6b 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -21,7 +21,6 @@ COMPAT_FREEBSD32	opt_global.h
 COMPAT_LINUX32		opt_compat.h
 LINPROCFS		opt_dontuse.h
 LINSYSFS		opt_dontuse.h
-NDISAPI			opt_dontuse.h
 
 TIMER_FREQ			opt_clock.h
 
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 73957449413f..011d787ec68c 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -25,7 +25,6 @@ COMPAT_AOUT		opt_dontuse.h
 COMPAT_LINUX		opt_dontuse.h
 LINPROCFS		opt_dontuse.h
 LINSYSFS		opt_dontuse.h
-NDISAPI			opt_dontuse.h
 
 # Change KVM size.  Changes things all over the kernel.
 KVA_PAGES		opt_global.h
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 47626787cab9..12d607be5598 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -887,10 +887,6 @@ options 	LINPROCFS
 # and PSEUDOFS)
 options 	LINSYSFS
 
-# Enable NDIS binary driver support
-options 	NDISAPI
-device		ndis
-
 

 #####################################################################
 # VM OPTIONS