diff options
| author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2008-09-28 15:28:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 04:22:48 -0400 |
| commit | 69d45dd1c3bb512a9f5f9c464ac625eb707669ec (patch) | |
| tree | 8cd3bdec6fe440e5983e319b9909bda6ddf497c4 /arch/x86/configs | |
| parent | d2f904bb9a1ba88a58a03612abd8c6c54bdaf73a (diff) | |
x86: merge winchip-2 and winchip-2a cpu choices
The Winchip-2 and Winchip-2A cpu choices select the
same options for kernel and compiler.
Merge them to save few bytes and reduce confusion.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Acked-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/configs')
| -rw-r--r-- | arch/x86/configs/i386_defconfig | 1 | ||||
| -rw-r--r-- | arch/x86/configs/x86_64_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index ca226ca31288..52d0359719d7 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig | |||
| @@ -213,7 +213,6 @@ CONFIG_M686=y | |||
| 213 | # CONFIG_MCRUSOE is not set | 213 | # CONFIG_MCRUSOE is not set |
| 214 | # CONFIG_MEFFICEON is not set | 214 | # CONFIG_MEFFICEON is not set |
| 215 | # CONFIG_MWINCHIPC6 is not set | 215 | # CONFIG_MWINCHIPC6 is not set |
| 216 | # CONFIG_MWINCHIP2 is not set | ||
| 217 | # CONFIG_MWINCHIP3D is not set | 216 | # CONFIG_MWINCHIP3D is not set |
| 218 | # CONFIG_MGEODEGX1 is not set | 217 | # CONFIG_MGEODEGX1 is not set |
| 219 | # CONFIG_MGEODE_LX is not set | 218 | # CONFIG_MGEODE_LX is not set |
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index 2c4b1c771e28..f0a03d7a7d63 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||
| @@ -210,7 +210,6 @@ CONFIG_X86_PC=y | |||
| 210 | # CONFIG_MCRUSOE is not set | 210 | # CONFIG_MCRUSOE is not set |
| 211 | # CONFIG_MEFFICEON is not set | 211 | # CONFIG_MEFFICEON is not set |
| 212 | # CONFIG_MWINCHIPC6 is not set | 212 | # CONFIG_MWINCHIPC6 is not set |
| 213 | # CONFIG_MWINCHIP2 is not set | ||
| 214 | # CONFIG_MWINCHIP3D is not set | 213 | # CONFIG_MWINCHIP3D is not set |
| 215 | # CONFIG_MGEODEGX1 is not set | 214 | # CONFIG_MGEODEGX1 is not set |
| 216 | # CONFIG_MGEODE_LX is not set | 215 | # CONFIG_MGEODE_LX is not set |