diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2018-07-15 14:20:55 +0000 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2018-07-15 14:20:55 +0000 |
| commit | bd945390486e175182221eedf6b96440504c1826 (patch) | |
| tree | 69cb91d05a8f6b8b06a46a2540efc158d21d5a48 /extra/linux-zen | |
| parent | 33cdc1bbe06ec2056941d2f23ab253eb404ed88b (diff) | |
| parent | c19180d9252ec5a5fe7438fba3ed589983d5ee5f (diff) | |
| download | packages-bd945390486e175182221eedf6b96440504c1826.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'extra/linux-zen')
| -rw-r--r-- | extra/linux-zen/PKGBUILD | 2 | ||||
| -rw-r--r-- | extra/linux-zen/config | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD index 8ebf550c..a27f746a 100644 --- a/extra/linux-zen/PKGBUILD +++ b/extra/linux-zen/PKGBUILD @@ -2,7 +2,7 @@ # fail if upstream's .config changes if [ "${sha256sums[6]}" = 'd75bb73c44df4c386c8fa2123ca52ec5255d5e52ad804872120824185cf1ba38' ]; then - sha256sums[6]='99dd50b6a8b542d1c59a8d5ef4b230d29476aef1ffb3c55b4bb5197e9e492616' + sha256sums[6]='68a5c63153bc08a48d013f373f321eb012b585d3b816d612ab2b0bfa3c4dd22a' fi eval "$( 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 |