summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2020-02-22 22:04:22 +0200
committerAqua-sama <aqua@iserlohn-fortress.net>2020-02-22 22:04:22 +0200
commitc292290249e381e3c9589016680fa752910d34cf (patch)
treeddc7c0b2c58aaeaae686fc1994ca2727ee57c0d9 /config
parentMerge branch 'upstream' (diff)
parentUpdated to 5.5.5 (diff)
downloadlinux-ck-c292290249e381e3c9589016680fa752910d34cf.tar.xz
Merge branch 'upstream'
Diffstat (limited to 'config')
-rw-r--r--config5
1 files changed, 2 insertions, 3 deletions
diff --git a/config b/config
index aaad6a6..f60ab4c 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.5.0 Kernel Configuration
+# Linux/x86 5.5.5 Kernel Configuration
#
#
@@ -9984,8 +9984,7 @@ CONFIG_FONT_8x16=y
# CONFIG_FONT_10x18 is not set
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_TER16x32 is not set
-CONFIG_FONT_AUTOSELECT=y
+CONFIG_FONT_TER16x32=y
CONFIG_SG_POOL=y
CONFIG_ARCH_HAS_PMEM_API=y
CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y