Merge 13159:13510 from trunk

[reactos.git] / reactos / config

diff --git a/reactos/config b/reactos/config
index 84bd534..5a8c1f6 100644 (file)
--- a/reactos/config
+++ b/reactos/config
@@ -8,7 +8,7 @@ ARCH := i386
 
 #
 # Which cpu should reactos optimze for
-# example : i486, i586, pentium, pentium2, pentum3, pentium4
+# example : i486, i586, pentium, pentium2, pentium3, pentium4
 #           athlon-xp, athlon-mp, k6-2, 
 #
 # see gcc manual for more cpu name and which cpu it can 
@@ -25,17 +25,17 @@ KDBG := 0
 #
 # Whether to compile for debugging
 #
-DBG := 0 
+DBG := 0
 
 #
 # Whether to compile with optimizations
 #
-OPTIMIZED := 0 
+OPTIMIZED := 0
 
 #
 # Whether to compile a multiprocessor or single processor version
 #
-MP := 0
+CONFIG_SMP := 0
 
 #
 # Whether to compile for ACPI compliant systems
@@ -45,7 +45,7 @@ ACPI := 0
 #
 # whether to use a 3GB User, 1GB Kernel memory map
 #
-3GB := 1
+3GB := 0
 
 #
 # Which version of NDIS do we support up to?