The branch stable/12 has been updated by brooks:

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

commit 7adbe9f763b6c2dac8f9dd058c45abc007d0ebc4
Author:     Brooks Davis <[email protected]>
AuthorDate: 2023-03-02 23:37:10 +0000
Commit:     Brooks Davis <[email protected]>
CommitDate: 2023-03-06 18:57:30 +0000

    NgATM: Remove useless NGATM_ATM option
    
    MFC after:      3 days
    
    Reviewed by:    emaste
    Differential Revision:  https://reviews.freebsd.org/D38875
    
    (cherry picked from commit bd32aedeee1a2af8293bfb1a2c85432b7ed8f207)
---
 sys/conf/NOTES   | 1 -
 sys/conf/options | 1 -
 2 files changed, 2 deletions(-)

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 56d7da23d685..94ebac12fa2f 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -812,7 +812,6 @@ options     NETGRAPH_VJC
 options        NETGRAPH_VLAN
 
 # NgATM - Netgraph ATM
-options        NGATM_ATM
 options        NGATM_ATMBASE
 options        NGATM_SSCOP
 options        NGATM_SSCFU
diff --git a/sys/conf/options b/sys/conf/options
index 3baf360381d7..5feb0ef8add2 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -556,7 +556,6 @@ NETGRAPH_VJC                opt_netgraph.h
 NETGRAPH_VLAN          opt_netgraph.h
 
 # NgATM options
-NGATM_ATM              opt_netgraph.h
 NGATM_ATMBASE          opt_netgraph.h
 NGATM_SSCOP            opt_netgraph.h
 NGATM_SSCFU            opt_netgraph.h

Reply via email to