From: Len Brown <len.brown@intel.com>
Date: Sat, 3 Sep 2005 06:44:09 +0000 (-0400)
Subject: Merge linux-2.6 into linux-acpi-2.6 test
X-Git-Tag: v2.6.14-rc1~256^2~14^2~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=129521dcc94f781890f8f668219ab79f0073ff9f;p=linux-2.6

Merge linux-2.6 into linux-acpi-2.6 test
---

129521dcc94f781890f8f668219ab79f0073ff9f
diff --cc arch/ia64/Kconfig
index addf07393e,3deced637f..e1c9ea03f3
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@@ -357,6 -381,14 +357,12 @@@ source "kernel/power/Kconfig
  
  source "drivers/acpi/Kconfig"
  
 -endif
 -
+ if PM
+ 
+ source "arch/ia64/kernel/cpufreq/Kconfig"
+ 
+ endif
+ 
  endmenu
  
  if !IA64_HP_SIM