aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@evo.osdl.org>2005-09-01 10:58:18 -0700
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-01 10:58:18 -0700
commit712fbdd33306aa07085d1e648b5f3d45d7943794 (patch)
tree5e8c905d983df3d54ae27e9c080fc6cfafe180eb /arch/ia64/Kconfig
parentb25dd2842bcaef2413db7a06c67034b187aa007f (diff)
parent986632fd7033a0199f9548c44606377cdf1f4a80 (diff)
Merge refs/heads/release from master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r--arch/ia64/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 80988136f26..3deced637f0 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -383,6 +383,12 @@ source "drivers/acpi/Kconfig"
endif
+if PM
+
+source "arch/ia64/kernel/cpufreq/Kconfig"
+
+endif
+
endmenu
if !IA64_HP_SIM