kernel: Update to 3.11.6.

[ipfire-3.x.git] / kernel / config-i686-default

diff --git a/kernel/config-i686-default b/kernel/config-i686-default
index 23d112774e3300829d12bbe9fcaec0b9ef69700f..586fcc30fe3db651af457db01546f67e564b87b6 100644 (file)
--- a/kernel/config-i686-default
+++ b/kernel/config-i686-default
@@ -12,10 +12,23 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
 #
 CONFIG_KTIME_SCALAR=y
 
+#
+# Timers subsystem
+#
+CONFIG_NO_HZ_IDLE=y
+
+#
+# CPU/Task time and stats accounting
+#
+# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_IRQ_TIME_ACCOUNTING=y
+
 #
 # RCU Subsystem
 #
 CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_NOCB_CPU_NONE is not set
+# CONFIG_RCU_NOCB_CPU_ZERO is not set
 
 #
 # Kernel Performance Events And Counters
@@ -23,6 +36,7 @@ CONFIG_RCU_FANOUT=32
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGACTION=y
 
 #
 # GCOV-based kernel profiling
@@ -33,6 +47,7 @@ CONFIG_LBDAF=y
 # Processor type and features
 #
 CONFIG_X86_BIGSMP=y
+# CONFIG_X86_GOLDFISH is not set
 # CONFIG_X86_WANT_INTEL_MID is not set
 # CONFIG_X86_RDC321X is not set
 CONFIG_X86_32_NON_STANDARD=y
@@ -70,7 +85,9 @@ CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_CPU_SUP_CYRIX_32=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
 CONFIG_NR_CPUS=32
 # CONFIG_X86_ANCIENT_MCE is not set
 CONFIG_VM86=y
@@ -79,6 +96,9 @@ CONFIG_TOSHIBA=m
 # CONFIG_NOHIGHMEM is not set
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HIGHMEM=y
 CONFIG_X86_PAE=y
@@ -138,6 +158,10 @@ CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
+
+#
+# PCI host controller drivers
+#
 # CONFIG_ISA is not set
 # CONFIG_SCx200 is not set
 # CONFIG_ALIX is not set
@@ -214,6 +238,11 @@ CONFIG_GEODE_WDT=m
 #
 CONFIG_VIDEO_CAFE_CCIC=m
 
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV7670=m
+
 #
 # Graphics support
 #
@@ -228,6 +257,7 @@ CONFIG_VIDEO_CAFE_CCIC=m
 # Frame buffer hardware drivers
 #
 # CONFIG_FB_I810 is not set
+# CONFIG_FB_GEODE is not set
 
 #
 # Console display driver support
@@ -254,10 +284,9 @@ CONFIG_TC1100_WMI=m
 CONFIG_CLKSRC_I8253=y
 
 #
-# Kernel hacking
+# Memory Debugging
 #
 # CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_DOUBLEFAULT=y
 
 #
 # Grsecurity
@@ -279,6 +308,11 @@ CONFIG_GRKERNSEC_VM86=y
 #
 # CONFIG_INTEL_TXT is not set
 
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
+
 #
 # Ciphers
 #