Update configs

[kernel-configs.git] / 4.14 / m68k

diff --git a/4.14/m68k b/4.14/m68k
index 69efe13c88f7f7f48cd7e5837ce578c062d31b74..4832f447ef3c32c82ceebbdf862b2b29496603f7 100644 (file)
--- a/4.14/m68k
+++ b/4.14/m68k
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/m68k 4.14.311-gnu1 Kernel Configuration
+# Linux/m68k 4.14.336-gnu1 Kernel Configuration
 #
 CONFIG_M68K=y
 CONFIG_CPU_BIG_ENDIAN=y
@@ -159,6 +159,7 @@ CONFIG_SLAB_FREELIST_RANDOM=y
 # CONFIG_SYSTEM_DATA_VERIFICATION is not set
 CONFIG_PROFILING=y
 # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 # CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_THIN_ARCHIVES=y
@@ -848,7 +849,6 @@ CONFIG_HAVE_NET_DSA=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
 CONFIG_LLC=m
 # CONFIG_LLC2 is not set
 CONFIG_IPX=m
@@ -919,8 +919,6 @@ CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 CONFIG_CLS_U32_PERF=y
 CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_BPF=m