diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-09-24 19:04:31 -0700 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-10 23:45:38 -0400 |
| commit | ee297533279a802eac8b1cbea8e65b24b36a1aac (patch) | |
| tree | 7d461186acef980755b625f932560552dcd92751 /arch/x86/kernel/cpu/cpufreq | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
ACPI: don't load acpi_cpufreq if acpi=off
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/x86/kernel/cpu/cpufreq')
| -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 dd097b83583..9943b4c8774 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) { int ret; + if (acpi_disabled) + return 0; + dprintk("acpi_cpufreq_init\n"); ret = acpi_cpufreq_early_init(); |