summaryrefslogtreecommitdiffstats
path: root/arch/ia64/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-09-03 08:44:09 +0200
committerLen Brown <len.brown@intel.com>2005-09-03 08:44:09 +0200
commit129521dcc94f781890f8f668219ab79f0073ff9f (patch)
tree9f70707c88da65577f38814fe37b24c4b4957d64 /arch/ia64/Kconfig
parent[ACPI] acpi_video_device_write_state() now works (diff)
parentMerge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/... (diff)
downloadlinux-129521dcc94f781890f8f668219ab79f0073ff9f.tar.xz
linux-129521dcc94f781890f8f668219ab79f0073ff9f.zip
Merge linux-2.6 into linux-acpi-2.6 test
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 addf07393ef4..e1c9ea03f31f 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -357,6 +357,12 @@ source "kernel/power/Kconfig"
source "drivers/acpi/Kconfig"
+if PM
+
+source "arch/ia64/kernel/cpufreq/Kconfig"
+
+endif
+
endmenu
if !IA64_HP_SIM