kernel: Update to 3.5.1.

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

diff --git a/kernel/config-i686-default b/kernel/config-i686-default
index e01dd3ed222c17f3163c71b42778547d907ef3e9..31014ae13d843d40201df70d20b42abbe2561e4d 100644 (file)
--- a/kernel/config-i686-default
+++ b/kernel/config-i686-default
@@ -3,11 +3,14 @@ CONFIG_X86_32=y
 # CONFIG_X86_64 is not set
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-# CONFIG_GENERIC_TIME_VSYSCALL is not set
 # CONFIG_ZONE_DMA32 is not set
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_X86_32_SMP=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
+
+#
+# IRQ subsystem
+#
 CONFIG_KTIME_SCALAR=y
 
 #
@@ -28,6 +31,7 @@ CONFIG_X86_BIGSMP=y
 # CONFIG_X86_RDC321X is not set
 CONFIG_X86_32_NON_STANDARD=y
 # CONFIG_X86_NUMAQ is not set
+# CONFIG_STA2X11 is not set
 # CONFIG_X86_SUMMIT is not set
 # CONFIG_X86_ES7000 is not set
 CONFIG_X86_32_IRIS=m
@@ -133,7 +137,6 @@ CONFIG_PCI_BIOS=y
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
 # CONFIG_ISA is not set
-# CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 # CONFIG_ALIX is not set
 # CONFIG_NET5501 is not set
@@ -261,7 +264,7 @@ CONFIG_CLKSRC_I8253=y
 CONFIG_DOUBLEFAULT=y
 
 #
-# PaX
+# Grsecurity
 #
 CONFIG_ARCH_TRACK_EXEC_LIMIT=y