kernel: Update to 3.6.6.

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

diff --git a/kernel/config-x86_64-default b/kernel/config-x86_64-default
index 1fa32dfcef903a13068e13d95be20c2ae50f27fa..5a6a0abc0d4f2066b715593be2a73f2d74ea26ab 100644 (file)
--- a/kernel/config-x86_64-default
+++ b/kernel/config-x86_64-default
@@ -12,8 +12,6 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -
 #
 # IRQ subsystem
 #
-CONFIG_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 
@@ -25,6 +23,7 @@ CONFIG_RCU_FANOUT=64
 #
 # Kernel Performance Events And Counters
 #
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 
 #
@@ -134,7 +133,7 @@ CONFIG_SGI_IOC4=m
 CONFIG_GPIO_LANGWELL=y
 
 #
-# Miscelaneous helper chips
+# Webcam and/or TV USB devices
 #
 # CONFIG_VIDEO_CAFE_CCIC is not set
 
@@ -145,6 +144,11 @@ CONFIG_EDAC_AMD64=m
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_SBRIDGE=m
 
+#
+# Xen driver support
+#
+# CONFIG_XEN_MCE_LOG is not set
+
 #
 # Hardware Spinlock drivers
 #
@@ -161,7 +165,6 @@ CONFIG_QUOTACTL_COMPAT=y
 # Kernel hacking
 #
 CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
 # CONFIG_IOMMU_DEBUG is not set
 
 #
@@ -188,5 +191,7 @@ CONFIG_CRYPTO_BLOWFISH_X86_64=m
 CONFIG_CRYPTO_CAMELLIA_X86_64=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m