From a8715d13739109e87551ff2c2558381bb83bc5b7 Mon Sep 17 00:00:00 2001 From: Paolo 'Blaisorblade' Giarrusso Date: Wed, 11 Oct 2006 01:21:35 -0700 Subject: [PATCH] --- yaml --- r: 39325 b: refs/heads/master c: 1b4ad242fcfcf1e261604cb91ee5fb8032900997 h: refs/heads/master i: 39323: 6345d2e11ac9c9b40fec908afa6d886bb1ea54c8 v: v3 --- [refs] | 2 +- trunk/arch/i386/Kconfig.cpu | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 26dc72a915c7..f3f12003f8db 100644 --- 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 index 21c9a4e71104..fc4f2abccf06 100644 --- 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