summaryrefslogtreecommitdiff
path: root/extra/linux-zen/config
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-07-15 14:20:55 +0000
committerAndreas Baumann <mail@andreasbaumann.cc>2018-07-15 14:20:55 +0000
commitbd945390486e175182221eedf6b96440504c1826 (patch)
tree69cb91d05a8f6b8b06a46a2540efc158d21d5a48 /extra/linux-zen/config
parent33cdc1bbe06ec2056941d2f23ab253eb404ed88b (diff)
parentc19180d9252ec5a5fe7438fba3ed589983d5ee5f (diff)
downloadpackages-bd945390486e175182221eedf6b96440504c1826.tar.xz
Merge branch 'master' into i486
Diffstat (limited to 'extra/linux-zen/config')
-rw-r--r--extra/linux-zen/config7
1 files changed, 5 insertions, 2 deletions
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index 0e2c6a7e..f66c880c 100644
--- a/extra/linux-zen/config
+++ b/extra/linux-zen/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.2-1 Kernel Configuration
+# Linux/x86 4.17.5-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -48,6 +48,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
# General setup
#
CONFIG_ZEN_INTERACTIVE=y
+# CONFIG_SCHED_MUQSS is not set
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
# CONFIG_COMPILE_TEST is not set
@@ -530,6 +531,8 @@ CONFIG_NR_CPUS=8
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
CONFIG_SCHED_MC_PRIO=y
+CONFIG_RQ_NONE=y
+CONFIG_SHARERQ=0
# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
@@ -7466,7 +7469,6 @@ CONFIG_ASYNC_TX_DMA=y
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
CONFIG_AUXDISPLAY=y
-CONFIG_CHARLCD=m
CONFIG_HD44780=m
CONFIG_KS0108=m
CONFIG_KS0108_PORT=0x378
@@ -7479,6 +7481,7 @@ CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
CONFIG_PANEL_PROFILE=5
# CONFIG_PANEL_CHANGE_MESSAGE is not set
+CONFIG_CHARLCD=m
CONFIG_UIO=m
CONFIG_UIO_CIF=m
CONFIG_UIO_PDRV_GENIRQ=m