diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 20:55:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 20:55:12 -0400 |
| commit | 016281880439a8665ecf37514865742da58131d4 (patch) | |
| tree | 2f6a757a581c71cfb8cd891e0583fbffb359830b /drivers/cpufreq | |
| parent | 17b141803c6c6e27fbade3f97c1c9d8d66c72866 (diff) | |
| parent | 865be7a81071a77014c83cd01536c989eed362b4 (diff) | |
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, cpu: Fix detection of Celeron Covington stepping A1 and B0
Documentation, ABI: Update L3 cache index disable text
x86, AMD, cacheinfo: Fix L3 cache index disable checks
x86, AMD, cacheinfo: Fix fallout caused by max3 conversion
x86, cpu: Change NOP selection for certain Intel CPUs
x86, cpu: Clean up and unify the NOP selection infrastructure
x86, percpu: Use ASM_NOP4 instead of hardcoding P6_NOP4
x86, cpu: Move AMD Elan Kconfig under "Processor family"
Fix up trivial conflicts in alternative handling (commit dc326fca2b64
"x86, cpu: Clean up and unify the NOP selection infrastructure" removed
some hacky 5-byte instruction stuff, while commit d430d3d7e646 "jump
label: Introduce static_branch() interface" renamed HAVE_JUMP_LABEL to
CONFIG_JUMP_LABEL in the code that went away)
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/Kconfig.x86 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86 index 343f84760487..78ff7ee48951 100644 --- a/drivers/cpufreq/Kconfig.x86 +++ b/drivers/cpufreq/Kconfig.x86 | |||
| @@ -35,7 +35,7 @@ config X86_ACPI_CPUFREQ | |||
| 35 | config ELAN_CPUFREQ | 35 | config ELAN_CPUFREQ |
| 36 | tristate "AMD Elan SC400 and SC410" | 36 | tristate "AMD Elan SC400 and SC410" |
| 37 | select CPU_FREQ_TABLE | 37 | select CPU_FREQ_TABLE |
| 38 | depends on X86_ELAN | 38 | depends on MELAN |
| 39 | ---help--- | 39 | ---help--- |
| 40 | This adds the CPUFreq driver for AMD Elan SC400 and SC410 | 40 | This adds the CPUFreq driver for AMD Elan SC400 and SC410 |
| 41 | processors. | 41 | processors. |
| @@ -51,7 +51,7 @@ config ELAN_CPUFREQ | |||
| 51 | config SC520_CPUFREQ | 51 | config SC520_CPUFREQ |
| 52 | tristate "AMD Elan SC520" | 52 | tristate "AMD Elan SC520" |
| 53 | select CPU_FREQ_TABLE | 53 | select CPU_FREQ_TABLE |
| 54 | depends on X86_ELAN | 54 | depends on MELAN |
| 55 | ---help--- | 55 | ---help--- |
| 56 | This adds the CPUFreq driver for AMD Elan SC520 processor. | 56 | This adds the CPUFreq driver for AMD Elan SC520 processor. |
| 57 | 57 | ||