u-boot: Update to 2013.07rc2.

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

diff --git a/kernel/config-i686-default b/kernel/config-i686-default
index ad335e1c214c6f6f5b605329341726aa25efa204..414eb3520837510323cb4f52b9d8afc0d9877eaa 100644 (file)
--- a/kernel/config-i686-default
+++ b/kernel/config-i686-default
@@ -1,6 +1,5 @@
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
-# CONFIG_X86_64 is not set
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
 # CONFIG_ZONE_DMA32 is not set
@@ -22,6 +21,9 @@ CONFIG_RCU_FANOUT=32
 # Kernel Performance Events And Counters
 #
 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
@@ -32,6 +34,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
@@ -42,7 +45,6 @@ CONFIG_X86_32_NON_STANDARD=y
 CONFIG_X86_32_IRIS=m
 CONFIG_XEN_MAX_DOMAIN_MEMORY=64
 # CONFIG_LGUEST_GUEST is not set
-# CONFIG_M386 is not set
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
 # CONFIG_M586TSC is not set
@@ -66,9 +68,6 @@ CONFIG_M686=y
 # CONFIG_MVIAC7 is not set
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_PPRO_FENCE is not set
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
 CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
@@ -213,12 +212,7 @@ CONFIG_GEODE_WDT=m
 # CONFIG_SBC7240_WDT is not set
 
 #
-# Media drivers
-#
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-
-#
-# Webcam and/or TV USB devices
+# Media digital TV PCI Adapters
 #
 CONFIG_VIDEO_CAFE_CCIC=m
 
@@ -243,7 +237,7 @@ CONFIG_VIDEO_CAFE_CCIC=m
 # CONFIG_SND_SIS7019 is not set
 
 #
-# Reporting subsystems
+# iptables trigger is under Netfilter config (LED target)
 #
 # CONFIG_EDAC_AMD76X is not set
 # CONFIG_EDAC_E7XXX is not set
@@ -265,6 +259,10 @@ CONFIG_CLKSRC_I8253=y
 # Kernel hacking
 #
 # CONFIG_DEBUG_HIGHMEM is not set
+
+#
+# RCU Debugging
+#
 CONFIG_DOUBLEFAULT=y
 
 #