---

yaml --- r: 39325 b: refs/heads/master c: 1b4ad24 h: refs/heads/master i: 39323: 6345d2e v: v3
git-mirror · Oct 11, 2006 · a8715d1 · a8715d1
1 parent c126fe1
commit a8715d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5cdb5797d364a112879e49cc708083853ffc592
+refs/heads/master: 1b4ad242fcfcf1e261604cb91ee5fb8032900997
diff --git a/trunk/arch/i386/Kconfig.cpu b/trunk/arch/i386/Kconfig.cpu
@@ -7,6 +7,7 @@ choice
 
 config M386
 	bool "386"
+	depends on !UML
 	---help---
 	  This is the processor type of your CPU. This information is used for
 	  optimizing purposes. In order to compile a kernel that can run on
@@ -301,7 +302,7 @@ config X86_USE_PPRO_CHECKSUM
 
 config X86_USE_3DNOW
 	bool
-	depends on MCYRIXIII || MK7 || MGEODE_LX
+	depends on (MCYRIXIII || MK7 || MGEODE_LX) && !UML
 	default y
 
 config X86_OOSTORE