aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-vanilla/kernelconfig.x86
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-08-11 09:57:25 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-08-11 09:57:58 +0000
commit3819f423fbcf28cbb5b68a0f7bf6a820faf9fa44 (patch)
tree6f91c673d3b2d5f7829682049534ef737ee13072 /main/linux-vanilla/kernelconfig.x86
parent30946554fb7fe7ba6676234aaac96b577b635827 (diff)
downloadaports-3819f423fbcf28cbb5b68a0f7bf6a820faf9fa44.tar.gz
aports-3819f423fbcf28cbb5b68a0f7bf6a820faf9fa44.tar.bz2
aports-3819f423fbcf28cbb5b68a0f7bf6a820faf9fa44.tar.xz
main/linux-vanilla: upgrade to 3.14.16
Diffstat (limited to 'main/linux-vanilla/kernelconfig.x86')
-rw-r--r--main/linux-vanilla/kernelconfig.x866
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