X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.9%2Fm68k;h=ca2beb3a0b69622feb65a4684b85c03719645cd4;hb=HEAD;hp=7c3a78b8384eb5248235a44d0ad83ca3365c26da;hpb=3367f9bdfe902f1ff65dcae192ca77eb588be0b3;p=kernel-configs.git

diff --git a/4.9/m68k b/4.9/m68k
index 7c3a78b..ce5ef0b 100644
--- a/4.9/m68k
+++ b/4.9/m68k
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/m68k 4.9.308-gnu1 Kernel Configuration
+# Linux/m68k 4.9.336-gnu1 Kernel Configuration
 #
 CONFIG_M68K=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -368,6 +368,7 @@ CONFIG_NET_FOU_IP_TUNNELS=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_TABLE_PERTURB_ORDER=16
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
@@ -1317,7 +1318,6 @@ CONFIG_NET_VENDOR_MARVELL=y
 # CONFIG_MVMDIO is not set
 # CONFIG_MVNETA_BM is not set
 CONFIG_NET_VENDOR_MICREL=y
-# CONFIG_KS8851_MLL is not set
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_MACSONIC=m
 CONFIG_NET_VENDOR_NETRONOME=y
@@ -1415,7 +1415,6 @@ CONFIG_SLIP_MODE_SLIP6=y
 #
 # CONFIG_WAN is not set
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -1578,6 +1577,7 @@ CONFIG_NVRAM=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
@@ -2372,6 +2372,7 @@ CONFIG_SCHED_STACK_END_CHECK=y
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_HAVE_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_BUGVERBOSE=y