diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-08-11 06:42:07 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-08-11 07:34:21 +0000 |
| commit | 1ef08fe67173fe30cf72b16f18ef811604a2d160 (patch) | |
| tree | 14129780f9c527ba41845b531cec9b5e4c9a8269 /main/linux-grsec/kernelconfig.x86 | |
| parent | e0fd958ebf647be0aec388571fe41e044f4684f2 (diff) | |
| download | aports-1ef08fe67173fe30cf72b16f18ef811604a2d160.tar.bz2 aports-1ef08fe67173fe30cf72b16f18ef811604a2d160.tar.xz | |
main/linux-grsec: upgrade to 3.14.16
Diffstat (limited to 'main/linux-grsec/kernelconfig.x86')
| -rw-r--r-- | main/linux-grsec/kernelconfig.x86 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index b41567a310..d0be256571 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.6 Kernel Configuration +# Linux/x86 3.14.16 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -313,6 +313,7 @@ CONFIG_INLINE_READ_UNLOCK=y CONFIG_INLINE_READ_UNLOCK_IRQ=y CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_FREEZER=y @@ -396,6 +397,7 @@ CONFIG_X86_IO_APIC=y # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set # CONFIG_X86_MCE is not set CONFIG_VM86=y +# CONFIG_X86_16BIT is not set CONFIG_TOSHIBA=m CONFIG_I8K=m CONFIG_X86_REBOOTFIXUPS=y @@ -1543,8 +1545,8 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set -CONFIG_PARPORT=m CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m # CONFIG_PARPORT_PC_FIFO is not set |