@@ -1027,27 +1027,27 @@ CONFIG_IMX111=y
# CONFIG_IMX111_ACT is not set
CONFIG_IMX119=y
CONFIG_INET=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_INET6_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_BEET=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET6_XFRM_TUNNEL=y
-CONFIG_INET_AH=y
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET_AH=m
CONFIG_INET_DIAG=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
# CONFIG_INET_LRO is not set
CONFIG_INET_TCP_DIAG=y
CONFIG_INET_TUNNEL=y
# CONFIG_INET_UDP_DIAG is not set
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_TUNNEL=m
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_INLINE_READ_LOCK is not set
@@ -1774,7 +1774,7 @@ CONFIG_NET_EMATCH_TEXT=y
CONFIG_NET_EMATCH_U32=y
# CONFIG_NET_IPGRE_DEMUX is not set
# CONFIG_NET_IPIP is not set
-CONFIG_NET_KEY=y
+CONFIG_NET_KEY=m
# CONFIG_NET_KEY_MIGRATE is not set
CONFIG_NET_NS=y
# CONFIG_NET_PKTGEN is not set
@@ -2908,11 +2908,11 @@ CONFIG_WIRELESS_EXT=y
CONFIG_WLAN=y
# CONFIG_X25 is not set
CONFIG_XFRM=y
-CONFIG_XFRM_IPCOMP=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
-CONFIG_XFRM_SUB_POLICY=y
-CONFIG_XFRM_USER=y
+CONFIG_XFRM_IPCOMP=m
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_USER=m
# CONFIG_XFS_FS is not set
# CONFIG_XIP_KERNEL is not set
CONFIG_XPS=y
Sync with the traditional Ubuntu kernel config options in regards to ipsec options. Signed-off-by: Tyler Hicks <tyhicks@canonical.com> --- debian.mako/config/config.common.ubuntu | 42 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-)