@@ -4 +4 @@
-# Sat Aug 26 23:28:46 2006
+# Fri Apr  6 14:29:52 2007
@@ -19 +19 @@
-CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
@@ -34,0 +35 @@
+# CONFIG_CPUSETS is not set
@@ -68,0 +70 @@
+CONFIG_STOP_MACHINE=y
@@ -138 +140,3 @@
-# CONFIG_SMP is not set
+CONFIG_SMP=y
+CONFIG_NR_CPUS=4
+# CONFIG_SCHED_SMT is not set
@@ -142,2 +146 @@
-CONFIG_X86_UP_APIC=y
-CONFIG_X86_UP_IOAPIC=y
+# CONFIG_PREEMPT_BKL is not set
@@ -182,0 +186 @@
+CONFIG_IRQBALANCE=y
@@ -186,3 +190,3 @@
-CONFIG_HZ_250=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=250
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
@@ -190,0 +195 @@
+# CONFIG_HOTPLUG_CPU is not set
@@ -328 +333 @@
-CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_FTP=y
@@ -361 +366 @@
-CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_FTP=y
@@ -426,2 +431,2 @@
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-CONFIG_NET_SCH_CLK_CPU=y
+CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
+# CONFIG_NET_SCH_CLK_CPU is not set
@@ -788 +793 @@
-CONFIG_E1000=m
+CONFIG_E1000=y
@@ -939 +943,0 @@
-# CONFIG_FTAPE is not set
@@ -1319 +1323 @@
-CONFIG_LOG_BUF_SHIFT=14
+CONFIG_LOG_BUF_SHIFT=15
@@ -1380,0 +1385,3 @@
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_X86_SMP=y
+CONFIG_X86_HT=y
@@ -1381,0 +1389 @@
+CONFIG_X86_TRAMPOLINE=y