From owner-dev-commits-src-main@freebsd.org Tue Jan 26 00:05:36 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B3E904F78A0; Tue, 26 Jan 2021 00:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DPn7N4k9rz3tTn; Tue, 26 Jan 2021 00:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 90BF91F8C1; Tue, 26 Jan 2021 00:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10Q05ast031057; Tue, 26 Jan 2021 00:05:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10Q05aQH031056; Tue, 26 Jan 2021 00:05:36 GMT (envelope-from git) Date: Tue, 26 Jan 2021 00:05:36 GMT Message-Id: <202101260005.10Q05aQH031056@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: b42a2ea5589f - main - Remove ndis(4) remnants from kernel configs MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b42a2ea5589f86911643b3ce1ebeace5d1e2c1eb Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jan 2021 00:05:36 -0000 The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b42a2ea5589f86911643b3ce1ebeace5d1e2c1eb commit b42a2ea5589f86911643b3ce1ebeace5d1e2c1eb Author: Mateusz Guzik AuthorDate: 2021-01-26 00:04:13 +0000 Commit: Mateusz Guzik 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