git: 97934f737548 - stable/14 - Revert superfluous mis-MFC of "Add ASMC_DEBUG make option"

The branch stable/14 has been updated by olce:

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

commit 97934f737548d1979aadd4acc54cc4de88d05dd2
Author:     Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2026-03-27 08:46:51 +0000
Commit:     Olivier Certner <olce@FreeBSD.org>
CommitDate: 2026-03-27 11:14:19 +0000

    Revert superfluous mis-MFC of "Add ASMC_DEBUG make option"
    
    Revert commit 12e1ab887d58 ("Add ASMC_DEBUG make option, 2026-01-04"),
    as the original commit it intended to MFC has already been MFCed as
    ab3eaa6ea29d846d on 2026/02/22 (UTC).  The reverted commit introduced
    some (superfluous) duplicate lines and an unrelated change.
    
    This is a direct commit to stable/14.
    
    Fixes:          12e1ab887d58 ("Add ASMC_DEBUG make option, 2026-01-04")
    Sponsored by:   The FreeBSD Foundation
---
 sys/amd64/conf/NOTES   | 4 ----
 sys/conf/options.amd64 | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 9640a7a59766..5599f0503887 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -114,10 +114,6 @@ options 	EFIRT
 device		asmc
 options		ASMC_DEBUG	# Enable asmc(4)-specific debug logic.
 
-# Apple System Management Controller (SMC)
-device		asmc
-options		ASMC_DEBUG	# Enable asmc(4)-specific debug logic.
-
 #
 # Intel QuickAssist driver with OpenCrypto support
 #
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index a3a735731438..c7c1f4da2a4a 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -66,8 +66,5 @@ NO_LEGACY_PCIB		opt_cpu.h
 # Compatibility with Linux MP table bugs.
 MPTABLE_LINUX_BUG_COMPAT
 
-# x86 specific uart options
-UART_NS8250_EARLY_PORT	opt_uart.h
-
 # Enable asmc(4)-specific debug logic.
 ASMC_DEBUG		opt_asmc.h