diff options
| author | Jesse Barnes <jbarnes@sgi.com> | 2005-04-25 20:31:04 (GMT) |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-04-25 20:31:04 (GMT) |
| commit | 605036cf8443b9172b24954dc1fd218e2049f91b (patch) | |
| tree | 6c74011e73452ff0a4d3212fef5373b241a843b0 /arch/ia64 | |
| parent | fc626b278a05a0fe3eb9abd1733120f2f400cbcd (diff) | |
| download | linux-605036cf8443b9172b24954dc1fd218e2049f91b.tar.xz | |
From: jbarnes@sgi.com
[IA64] fix ia64 Kconfig to allow CONFIG_PM on sn2
This probably should have been fixed when I fixed up the generic build for
discontig+numa machines, but oh well.
CONFIG_PM is allowable for generic builds but not for sn2 builds, which
doesn't make much sense, and in fact breaks the build if recent ACPI bits are
added to the tree. It looks like the only arch that needs to prevent
CONFIG_PM stuff is the ski simulator (though those options could probably use
some cleanup as well), so remove the big conditional and replace it with a
simple test for IA64_HP_SIM instead.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 33fcb20..468dbe8 100644 --- a/arch/ia64/Kconfig +++ b/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 |