diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
| commit | 129521dcc94f781890f8f668219ab79f0073ff9f (patch) | |
| tree | 9f70707c88da65577f38814fe37b24c4b4957d64 /arch/ia64/Kconfig | |
| parent | 824b558bbe2c298b165cdb54c33718994dda30bb (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 6 |
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" | |||
| 357 | 357 | ||
| 358 | source "drivers/acpi/Kconfig" | 358 | source "drivers/acpi/Kconfig" |
| 359 | 359 | ||
| 360 | if PM | ||
| 361 | |||
| 362 | source "arch/ia64/kernel/cpufreq/Kconfig" | ||
| 363 | |||
| 364 | endif | ||
| 365 | |||
| 360 | endmenu | 366 | endmenu |
| 361 | 367 | ||
| 362 | if !IA64_HP_SIM | 368 | if !IA64_HP_SIM |