diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-10 19:55:28 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-10 19:55:28 -0500 |
| commit | 84abd88a70090cf00f9e45c3a81680874f17626e (patch) | |
| tree | 4f58b80057f6e1f5817af1dc33a5458b3dfc9a99 /arch/x86/Kconfig.cpu | |
| parent | 13ca0fcaa33f6b1984c4111b6ec5df42689fea6f (diff) | |
| parent | e28cab42f384745c8a947a9ccd51e4aae52f5d51 (diff) | |
Merge remote branch 'linus/master' into x86/bootmem
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 621f2bd0ef56..f20ddf84a893 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu | |||
| @@ -402,7 +402,7 @@ config X86_CMPXCHG64 | |||
| 402 | # generates cmov. | 402 | # generates cmov. |
| 403 | config X86_CMOV | 403 | config X86_CMOV |
| 404 | def_bool y | 404 | def_bool y |
| 405 | depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM) | 405 | depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX) |
| 406 | 406 | ||
| 407 | config X86_MINIMUM_CPU_FAMILY | 407 | config X86_MINIMUM_CPU_FAMILY |
| 408 | int | 408 | int |