kernel: Update to 3.3.6.

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

diff --git a/kernel/config-i686-default b/kernel/config-i686-default
index 5a4ba8feb8d37523a123aab711b174c038aebb22..c273ee1d07868dd8e74140f9de82e9fcba512c04 100644 (file)
--- a/kernel/config-i686-default
+++ b/kernel/config-i686-default
@@ -31,8 +31,8 @@ CONFIG_X86_32_NON_STANDARD=y
 # CONFIG_X86_SUMMIT is not set
 # CONFIG_X86_ES7000 is not set
 CONFIG_X86_32_IRIS=m
+CONFIG_XEN_MAX_DOMAIN_MEMORY=64
 # CONFIG_LGUEST_GUEST is not set
-CONFIG_X86_CYCLONE_TIMER=y
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
@@ -133,6 +133,8 @@ CONFIG_X86_LONGRUN=y
 # CONFIG_PCI_GODIRECT is not set
 CONFIG_PCI_GOANY=y
 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
@@ -146,7 +148,7 @@ CONFIG_PCI_BIOS=y
 # CONFIG_HOTPLUG_PCI_SHPC is not set
 
 #
-# Protocols
+# Misc devices
 #
 CONFIG_IBM_ASM=m
 # CONFIG_SGI_IOC4 is not set
@@ -243,7 +245,7 @@ CONFIG_VIDEO_CAFE_CCIC=m
 # CONFIG_EDAC_R82600 is not set
 
 #
-# Speakup console speech
+# Android
 #
 CONFIG_TC1100_WMI=m
 
@@ -284,6 +286,7 @@ CONFIG_PAX_SEGMEXEC=y
 #
 CONFIG_CRYPTO_AES_586=y
 # CONFIG_CRYPTO_SALSA20_586 is not set
+CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_TWOFISH_586=m
 
 #