diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2018-08-03 16:26:17 +0000 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2018-08-03 16:26:17 +0000 |
| commit | 28cb1b2a1433935ddd9071fbd743d92bf3ba3cf9 (patch) | |
| tree | 648594b4f5e5e1c84cde2f6043dc81ca0236a9c0 /core/linux/config | |
| parent | 0056ae3e53f0ebc43d2ddff06047627115295101 (diff) | |
| parent | e832281fc806cde356864067db9b966caa71d3d1 (diff) | |
| download | packages-28cb1b2a1433935ddd9071fbd743d92bf3ba3cf9.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'core/linux/config')
| -rw-r--r-- | core/linux/config | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/linux/config b/core/linux/config index 46159c16..5a7fdf1c 100644 --- a/core/linux/config +++ b/core/linux/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.17.6-1 Kernel Configuration +# Linux/x86 4.17.11-arch1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -50,8 +50,8 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-ARCH" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y @@ -9360,7 +9360,6 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m -# CONFIG_CRYPTO_SALSA20_586 is not set CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m |