X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.9%2Fm68k;h=e3176fb7fb189a427098583f13b4e09e74e7d85b;hb=96f72fae57373690e8869950726ea65d3ed16a85;hp=8ff85b45efb2ffcea827cf081498ad77d69a44e6;hpb=35497fb45f9fe9a952596eeaa41d7e044edc08d8;p=kernel-configs.git

diff --git a/4.9/m68k b/4.9/m68k
index 8ff85b4..e3176fb 100644
--- a/4.9/m68k
+++ b/4.9/m68k
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/m68k 4.9.293-gnu1 Kernel Configuration
+# Linux/m68k 4.9.317-gnu1 Kernel Configuration
 #
 CONFIG_M68K=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -134,6 +134,7 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
+# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
 CONFIG_USERFAULTFD=y
 CONFIG_MEMBARRIER=y
 # CONFIG_EMBEDDED is not set
@@ -1316,7 +1317,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
@@ -1414,7 +1414,6 @@ CONFIG_SLIP_MODE_SLIP6=y
 #
 # CONFIG_WAN is not set
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -1811,7 +1810,6 @@ CONFIG_HID_TOPSEED=m
 CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
 CONFIG_HID_ZEROPLUS=m