From 027ebd2f39fc593ca26af67b773bacd99c2f3d67 Mon Sep 17 00:00:00 2001
From: Hartmut Brandt <harti@FreeBSD.org>
Date: Mon, 27 Oct 2003 11:19:08 +0000
Subject: [PATCH] Allow building the NgATM SAAL layer directly into the kernel.

---
 sys/conf/NOTES       | 5 ++++-
 sys/conf/files       | 8 +++++++-
 sys/conf/kern.pre.mk | 3 +++
 sys/conf/options     | 3 +++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 23019bc9a91e..73000a128612 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -452,7 +452,10 @@ options 	NETGRAPH_VJC
 options		NETGRAPH_ATM_ATMPIF
 
 # NgATM - Netgraph ATM
-options		NGATM_ATM
+options 	NGATM_ATM
+options 	NGATM_ATMBASE
+options 	NGATM_SSCOP
+options 	NGATM_SSCFU
 
 device		mn	# Munich32x/Falc54 Nx64kbit/sec cards.
 device		lmc	# tulip based LanMedia WAN cards
diff --git a/sys/conf/files b/sys/conf/files
index 65ea27d551b3..689d9282180c 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1370,7 +1370,13 @@ netatm/uni/unisig_util.c	optional atm_uni atm_core
 netatm/uni/unisig_vc_state.c	optional atm_uni atm_core
 netgraph/atm/atmpif/ng_atmpif.c	optional netgraph_atm_atmpif
 netgraph/atm/atmpif/ng_atmpif_harp.c	optional netgraph_atm_atmpif
-netgraph/atm/ng_atm.c	optional ngatm_atm
+netgraph/atm/ngatmbase.c			optional ngatm_atmbase
+contrib/ngatm/netnatm/misc/unimsg_common.c	optional ngatm_atmbase
+netgraph/atm/ng_atm.c		optional ngatm_atm
+netgraph/atm/sscfu/ng_sscfu.c		optional ngatm_sscfu
+contrib/ngatm/netnatm/saal/saal_sscfu.c	optional ngatm_sscfu
+netgraph/atm/sscop/ng_sscop.c		optional ngatm_sscop
+contrib/ngatm/netnatm/saal/saal_sscop.c	optional ngatm_sscop
 netgraph/ng_UI.c	optional netgraph_UI
 netgraph/ng_async.c	optional netgraph_async
 netgraph/ng_base.c	optional netgraph
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 9f265ade2d83..bb8210c5d485 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -35,6 +35,9 @@ INCLUDES+= -I$S/contrib/ipfilter
 # ... and the same for Atheros HAL
 INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd
 
+# ... and the same for the NgATM stuff
+INCLUDES+= -I$S/contrib/ngatm
+
 COPTS=	${INCLUDES} -D_KERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -fno-common
 
diff --git a/sys/conf/options b/sys/conf/options
index 0d51447be90d..0e6cb61be5dd 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -404,6 +404,9 @@ NETGRAPH_ATM_ATMPIF	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
 
 # DRM options
 DRM_DEBUG		opt_drm.h