summaryrefslogtreecommitdiff
path: root/kernel/power
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-14 08:57:30 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-14 08:57:30 -0400
commitdbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9 (patch)
tree8641efeba632bddfa0e486b41a5f19578b1a1a31 /kernel/power
parent142e27fc8a3619471669d6241784eec9167c47d1 (diff)
parent2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff)
downloadlwn-dbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9.tar.gz
lwn-dbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index c14cd9991181..396c7873e804 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -1,5 +1,6 @@
config PM
bool "Power Management support"
+ depends on !IA64_HP_SIM
---help---
"Power Management" means that parts of your computer are shut
off or put into a power conserving "sleep" mode if they are not