The branch main has been updated by jhb:

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

commit 5ea0b89242dbc1e4d4bac16983291a7c3803f88e
Author:     John Baldwin <j...@freebsd.org>
AuthorDate: 2024-04-14 02:11:49 +0000
Commit:     John Baldwin <j...@freebsd.org>
CommitDate: 2024-04-14 02:11:49 +0000

    NOTES: Move ENABLE_ALART option to MI NOTES next to intpm device
    
    This option is for this driver.
    
    Reviewed by:    imp
    Differential Revision:  https://reviews.freebsd.org/D44786
---
 sys/amd64/conf/NOTES | 5 -----
 sys/conf/NOTES       | 1 +
 sys/i386/conf/NOTES  | 5 -----
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 49d2bec91364..f69a25213e49 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -544,11 +544,6 @@ device             cpuctl
 #
 device         superio
 
-#
-# System Management Bus (SMB)
-#
-options        ENABLE_ALART            # Control alarm on Intel intpm driver
-
 #
 # AMD System Management Network (SMN)
 #
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index cb28ddd00c20..3bdfdbe6e7eb 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2224,6 +2224,7 @@ device            rtsx
 device         smbus           # Bus support, required for smb below.
 
 device         intpm
+options        ENABLE_ALART    # Control alarm on Intel intpm driver
 device         alpm
 device         ichsmb
 device         viapm
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 8f6098301b12..7137fd983c66 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -759,11 +759,6 @@ device             cpuctl
 #
 device         superio
 
-#
-# System Management Bus (SMB)
-#
-options        ENABLE_ALART            # Control alarm on Intel intpm driver
-
 #
 # HID-over-I2C support
 #

Reply via email to