diff options
author | Ian Campbell <ijc@hellion.org.uk> | 2011-04-08 02:42:29 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-04-08 16:01:25 -0400 |
commit | ce9c99af8d4b3b0b9463654fd252d8640d804dc3 (patch) | |
tree | b5754ba3e8bf1022c58467992435d7670112aa52 /arch/x86/Kconfig | |
parent | 6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff) |
x86, cpu: Move AMD Elan Kconfig under "Processor family"
Currently the option resides under X86_EXTENDED_PLATFORM due to historical
nonstandard A20M# handling. However that is no longer the case and so Elan can
be treated as part of the standard processor choice Kconfig option.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Link: http://lkml.kernel.org/r/1302245177.31620.47.camel@localhost.localdomain
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index cc6c53a95bfd..f00a3f377cc0 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -365,17 +365,6 @@ config X86_UV | |||
365 | # Following is an alphabetically sorted list of 32 bit extended platforms | 365 | # Following is an alphabetically sorted list of 32 bit extended platforms |
366 | # Please maintain the alphabetic order if and when there are additions | 366 | # Please maintain the alphabetic order if and when there are additions |
367 | 367 | ||
368 | config X86_ELAN | ||
369 | bool "AMD Elan" | ||
370 | depends on X86_32 | ||
371 | depends on X86_EXTENDED_PLATFORM | ||
372 | ---help--- | ||
373 | Select this for an AMD Elan processor. | ||
374 | |||
375 | Do not use this option for K6/Athlon/Opteron processors! | ||
376 | |||
377 | If unsure, choose "PC-compatible" instead. | ||
378 | |||
379 | config X86_INTEL_CE | 368 | config X86_INTEL_CE |
380 | bool "CE4100 TV platform" | 369 | bool "CE4100 TV platform" |
381 | depends on PCI | 370 | depends on PCI |