diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 09:04:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 09:04:32 +0100 |
| commit | d12418fdeafdc08dd5bbec89d3e07e47ee75da55 (patch) | |
| tree | ac94d5bf58360b89fc7439fb52182c17d0674b0a /arch/x86/Kconfig.cpu | |
| parent | x86: cleanup remaining cpumask_t ops in smpboot code (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm (diff) | |
| download | linux-d12418fdeafdc08dd5bbec89d3e07e47ee75da55.tar.xz linux-d12418fdeafdc08dd5bbec89d3e07e47ee75da55.zip | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch/x86/Kconfig.cpu')
| -rw-r--r-- | arch/x86/Kconfig.cpu | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 85a78575956c..8078955845ae 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -408,7 +408,7 @@ config X86_MINIMUM_CPU_FAMILY config X86_DEBUGCTLMSR def_bool y - depends on !(MK6 || MWINCHIPC6 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386) + depends on !(MK6 || MWINCHIPC6 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386) && !UML menuconfig PROCESSOR_SELECT bool "Supported processor vendors" if EMBEDDED |