diff options
author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2015-01-20 13:38:58 -0200 |
---|---|---|
committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2015-01-20 13:38:58 -0200 |
commit | ee507a0c39c1266b35158689cad8f7fe531f396a (patch) | |
tree | e0b37782f810aaaea25e328efa10a4560b6c3b27 /kernels/linux-libre-lts-knock/config.i686 | |
parent | 03e1b1f2144c92194acd4d1d9a0c6e10ac51a4a3 (diff) | |
parent | a2df7958861eec4672c47cf90fe593a10cc42c8f (diff) |
Merge branch 'master' of ssh://projects.parabola.nu:1863/~git/abslibre/abslibre
Diffstat (limited to 'kernels/linux-libre-lts-knock/config.i686')
-rw-r--r-- | kernels/linux-libre-lts-knock/config.i686 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernels/linux-libre-lts-knock/config.i686 b/kernels/linux-libre-lts-knock/config.i686 index 5d9a91071..a2cfead3e 100644 --- a/kernels/linux-libre-lts-knock/config.i686 +++ b/kernels/linux-libre-lts-knock/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.19-gnu-1-lts-knock Kernel Configuration +# Linux/x86 3.14.21-gnu-1-lts-knock Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -460,7 +460,7 @@ CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m |