Merge 13159:13510 from trunk

[reactos.git] / reactos / config

diff --git a/reactos/config b/reactos/config
index 6e736dd..5a8c1f6 100644 (file)
--- a/reactos/config
+++ b/reactos/config
@@ -8,8 +8,8 @@ ARCH := i386
 
 #
 # Which cpu should reactos optimze for
-# example : i486, i586, pentium, pentium2, pentum3, pentium4
-#           athlond-xp, athlond-mp, k6-2, 
+# 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 
 # be optimze for. 
@@ -35,7 +35,7 @@ OPTIMIZED := 0
 #
 # Whether to compile a multiprocessor or single processor version
 #
-MP := 0
+CONFIG_SMP := 0
 
 #
 # Whether to compile for ACPI compliant systems
@@ -43,14 +43,9 @@ MP := 0
 ACPI := 0
 
 #
-# Whether to build regression tests
+# whether to use a 3GB User, 1GB Kernel memory map
 #
-REGRESSIONTESTS := 0
-
-#
-# Whether to use Structured Exception Handling
-#
-SEH := 0
+3GB := 0
 
 #
 # Which version of NDIS do we support up to?