diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-18 05:38:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-18 05:39:00 -0400 |
| commit | 8dd8997d2c56c9f248294805e129e1fc69444380 (patch) | |
| tree | 3b030a04295fc031db98746c4074c2df1ed6a19f /arch/x86/Kconfig.cpu | |
| parent | 1eda75c131ea42ec173323b6c34aeed78ae637c1 (diff) | |
| parent | 016aa2ed1cc9cf704cf76d8df07751b6daa9750f (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig.cpu')
| -rw-r--r-- | arch/x86/Kconfig.cpu | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index e6d3013f7ec3..75d89ac58d28 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu | |||
| @@ -294,11 +294,6 @@ config X86_GENERIC | |||
| 294 | 294 | ||
| 295 | endif | 295 | endif |
| 296 | 296 | ||
| 297 | config X86_CPU | ||
| 298 | def_bool y | ||
| 299 | select GENERIC_FIND_FIRST_BIT | ||
| 300 | select GENERIC_FIND_NEXT_BIT | ||
| 301 | |||
| 302 | # | 297 | # |
| 303 | # Define implied options from the CPU selection here | 298 | # Define implied options from the CPU selection here |
| 304 | config X86_INTERNODE_CACHE_SHIFT | 299 | config X86_INTERNODE_CACHE_SHIFT |