diff options
Diffstat (limited to 'main/linux-vanilla/kernelconfig.x86')
| -rw-r--r-- | main/linux-vanilla/kernelconfig.x86 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/linux-vanilla/kernelconfig.x86 b/main/linux-vanilla/kernelconfig.x86 index 25713e757a..d1943657b0 100644 --- a/main/linux-vanilla/kernelconfig.x86 +++ b/main/linux-vanilla/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 @@ -318,6 +318,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 @@ -401,6 +402,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 @@ -1544,8 +1546,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 |