From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Fri, 11 Feb 2005 05:48:27 +0000 (+0000)
Subject: fixed config file for vs1.9.3.17 merge
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~252
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=37b8225671ad3f83c262d2d603cf8ece4611017d;p=linux-2.6.git

fixed config file for vs1.9.3.17 merge
---

diff --git a/configs/kernel-2.6.10-i686-planetlab.config b/configs/kernel-2.6.10-i686-planetlab.config
index ef86d9ea3..fd9132544 100644
--- a/configs/kernel-2.6.10-i686-planetlab.config
+++ b/configs/kernel-2.6.10-i686-planetlab.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.10-1.12_FC2.1.planetlab
-# Wed Feb  9 08:06:26 2005
+# Thu Feb 10 23:10:33 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -107,7 +107,6 @@ CONFIG_M686=y
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MVIAC3_2 is not set
-CONFIG_X86_HZ=1000
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CMPXCHG=y
 CONFIG_X86_XADD=y
@@ -126,6 +125,7 @@ CONFIG_HPET_TIMER=y
 # CONFIG_SMP is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_X86_UP_APIC is not set
+CONFIG_KERNEL_HZ=1000
 CONFIG_X86_TSC=y
 CONFIG_X86_MCE=y
 # CONFIG_X86_MCE_NONFATAL is not set