diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:35:56 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:35:56 -0400 |
| commit | 1b79b27da172d6c868746135feeb71de4ddd0646 (patch) | |
| tree | 567ab66f1a60e322d161e0e44bdf48cb13e55c66 /arch | |
| parent | 7674416db4ee3d43813dddb650364ca994755256 (diff) | |
| parent | fa89b6089b5f4c7a5244b642caaca3e72b06ebe4 (diff) | |
Merge branch 'yinghai' into test
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c index dd097b835839..9943b4c87746 100644 --- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | |||
| @@ -779,6 +779,9 @@ static int __init acpi_cpufreq_init(void) | |||
| 779 | { | 779 | { |
| 780 | int ret; | 780 | int ret; |
| 781 | 781 | ||
| 782 | if (acpi_disabled) | ||
| 783 | return 0; | ||
| 784 | |||
| 782 | dprintk("acpi_cpufreq_init\n"); | 785 | dprintk("acpi_cpufreq_init\n"); |
| 783 | 786 | ||
| 784 | ret = acpi_cpufreq_early_init(); | 787 | ret = acpi_cpufreq_early_init(); |