X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fcpu%2Fcpufreq%2Facpi-cpufreq.c;h=8e48c5d4467df61d3652a39b06b85e7389143c54;hb=1f6d6e8ebe73ba9d9d4c693f7f6f50f661dbd6e4;hp=c24c4a487b7cb05f8ec6ad73998a2e0e01439d32;hpb=be3bfbba8f7f6c8f32e8444ef895433701a3f801;p=linux-2.6-omap-h63xx.git

diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index c24c4a487b7..8e48c5d4467 100644
--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -780,6 +780,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();