The branch stable/12 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=45fca9a779f8ba0b11c9e999490b6d525e945ef0
commit 45fca9a779f8ba0b11c9e999490b6d525e945ef0 Author: Brooks Davis <[email protected]> AuthorDate: 2023-03-02 23:36:55 +0000 Commit: Brooks Davis <[email protected]> CommitDate: 2023-03-06 18:57:30 +0000 NATM: Remove useless NETGRAPH_ATM_ATMPIF option This code was removed as part of the NATM removal in 2017 and somehow this option was missed. MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38874 (cherry picked from commit 3746e90118c941eb5c9123e22fe05026b78382ab) --- sys/conf/NOTES | 1 - sys/conf/options | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 611a8827e47e..56d7da23d685 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -763,7 +763,6 @@ options NETGRAPH_DEBUG # enable extra debugging, this # Node types options NETGRAPH_ASYNC options NETGRAPH_ATMLLC -options NETGRAPH_ATM_ATMPIF options NETGRAPH_BLUETOOTH # ng_bluetooth(4) options NETGRAPH_BLUETOOTH_BT3C # ng_bt3c(4) options NETGRAPH_BLUETOOTH_HCI # ng_hci(4) diff --git a/sys/conf/options b/sys/conf/options index b2c3eebacf70..3baf360381d7 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -503,7 +503,6 @@ NETGRAPH NETGRAPH_DEBUG opt_netgraph.h NETGRAPH_ASYNC opt_netgraph.h NETGRAPH_ATMLLC opt_netgraph.h -NETGRAPH_ATM_ATMPIF opt_netgraph.h NETGRAPH_BLUETOOTH opt_netgraph.h NETGRAPH_BLUETOOTH_BT3C opt_netgraph.h NETGRAPH_BLUETOOTH_H4 opt_netgraph.h
