diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-07 06:38:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-07 06:38:41 -0400 |
| commit | 242898be7a1921f646ca529ddc26d7337c69922f (patch) | |
| tree | 674adf64ca6254318dab5bcd428ebe8ac73957ff /arch/i386/kernel/cpu/cpufreq/Kconfig | |
| parent | 6bbad18a8b18228fa65d73547dfd5efad1515ef8 (diff) | |
| parent | 9f737633e6ee54fc174282d49b2559bd2208391d (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/i386/kernel/cpu/cpufreq/Kconfig')
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/Kconfig b/arch/i386/kernel/cpu/cpufreq/Kconfig index e44a4c6a4fe5..ccc1edff5c97 100644 --- a/arch/i386/kernel/cpu/cpufreq/Kconfig +++ b/arch/i386/kernel/cpu/cpufreq/Kconfig | |||
| @@ -96,6 +96,7 @@ config X86_POWERNOW_K8_ACPI | |||
| 96 | 96 | ||
| 97 | config X86_GX_SUSPMOD | 97 | config X86_GX_SUSPMOD |
| 98 | tristate "Cyrix MediaGX/NatSemi Geode Suspend Modulation" | 98 | tristate "Cyrix MediaGX/NatSemi Geode Suspend Modulation" |
| 99 | depends on PCI | ||
| 99 | help | 100 | help |
| 100 | This add the CPUFreq driver for NatSemi Geode processors which | 101 | This add the CPUFreq driver for NatSemi Geode processors which |
| 101 | support suspend modulation. | 102 | support suspend modulation. |
| @@ -202,7 +203,7 @@ config X86_LONGRUN | |||
| 202 | config X86_LONGHAUL | 203 | config X86_LONGHAUL |
| 203 | tristate "VIA Cyrix III Longhaul" | 204 | tristate "VIA Cyrix III Longhaul" |
| 204 | select CPU_FREQ_TABLE | 205 | select CPU_FREQ_TABLE |
| 205 | depends on BROKEN | 206 | depends on ACPI_PROCESSOR |
| 206 | help | 207 | help |
| 207 | This adds the CPUFreq driver for VIA Samuel/CyrixIII, | 208 | This adds the CPUFreq driver for VIA Samuel/CyrixIII, |
| 208 | VIA Cyrix Samuel/C3, VIA Cyrix Ezra and VIA Cyrix Ezra-T | 209 | VIA Cyrix Samuel/C3, VIA Cyrix Ezra and VIA Cyrix Ezra-T |