- up to 3.7.0; aufs not in final version; vserver not ready yet (at upstream)

[packages/kernel.git] / kernel-x86.config

diff --git a/kernel-x86.config b/kernel-x86.config
index f7c75a9fc5f9e513f2fa4d7f67a55141b3a5ac95..f84348c68f8d0c06ab82ec36765d81e2be67af22 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -32,7 +32,6 @@ SCHED_OMIT_FRAME_POINTER i386=y x86_64=y
 PARAVIRT_GUEST x86=y
 PARAVIRT_TIME_ACCOUNTING x86=y
 #- file arch/x86/xen/Kconfig goes here
-KVM_CLOCK x86=y
 KVM_GUEST x86=y
 #- file arch/x86/lguest/Kconfig goes here
 PARAVIRT x86=y
@@ -50,7 +49,6 @@ MAXSMP i386=n x86_64=n
 NR_CPUS x86=32
 SCHED_SMT x86=y
 SCHED_MC x86=y
-IRQ_TIME_ACCOUNTING x86=n
 #- file kernel/Kconfig.preempt goes here
 X86_UP_APIC i386=y
 X86_UP_IOAPIC i386=y
@@ -141,6 +139,7 @@ X86_X32 all=n
 #- file drivers/firmware/Kconfig goes here
 #- file fs/Kconfig goes here
 #- file arch/x86/Kconfig.debug goes here
+#- file kernel/vserver/Kconfig goes here
 #- file security/Kconfig goes here
 #- file crypto/Kconfig goes here
 #- file arch/x86/kvm/Kconfig goes here
@@ -232,6 +231,7 @@ XEN_DEBUG_FS x86=n
 #-
 X86_PCC_CPUFREQ x86=m x86_64=m
 X86_ACPI_CPUFREQ x86=m
+X86_ACPI_CPUFREQ_CPB all=y
 X86_POWERNOW_K6 i386=m
 X86_POWERNOW_K7 i386=m
 X86_POWERNOW_K8 x86=m
@@ -254,6 +254,17 @@ X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
 AMD_IOMMU x86_64=y
 AMD_IOMMU_STATS x86_64=n
 
+#-
+#- *** FILE: init/Kconfig ***
+#-
+#- file kernel/irq/Kconfig goes here
+#- file kernel/time/Kconfig goes here
+IRQ_TIME_ACCOUNTING x86=n
+#- file usr/Kconfig goes here
+#- file arch/Kconfig goes here
+#- file block/Kconfig goes here
+#- file kernel/Kconfig.locks goes here
+
 #-
 #- *** FILE: kernel/irq/Kconfig ***
 #-
@@ -274,5 +285,6 @@ DEBUG_PER_CPU_MAPS x86=n
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
 EARLY_PRINTK_MRST x86=n
+KVM_CLOCK x86=y
 MCA i386=y
 X86_MRST i386=y