From b7dfe2ced97992e210d3adac66ed59ea69f9e422 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Mon, 25 Apr 2005 13:31:04 -0700 Subject: [PATCH] --- yaml --- r: 527 b: refs/heads/master c: 605036cf8443b9172b24954dc1fd218e2049f91b h: refs/heads/master i: 525: 2bbeff95f9e911327be5df3a52e090f7957b54d6 523: 0f43157a9bf0718e8c1cea7f84b39817afbef6f0 519: f0a750c9c10e0e3291b23bce60de670d278c479c 511: a4ccb142a09ad69976cf727ba97be442de09b822 v: v3 --- [refs] | 2 +- trunk/arch/ia64/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bf5af2b6655a..853d4591ad3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc626b278a05a0fe3eb9abd1733120f2f400cbcd +refs/heads/master: 605036cf8443b9172b24954dc1fd218e2049f91b diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig index 33fcb205fcb7..468dbe8a6b9c 100644 --- a/trunk/arch/ia64/Kconfig +++ b/trunk/arch/ia64/Kconfig @@ -329,7 +329,7 @@ menu "Power management and ACPI" config PM bool "Power Management support" - depends on IA64_GENERIC || IA64_DIG || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB + depends on !IA64_HP_SIM default y help "Power Management" means that parts of your computer are shut