]> err.no Git - linux-2.6/commit
From: jbarnes@sgi.com
authorJesse Barnes <jbarnes@sgi.com>
Mon, 25 Apr 2005 20:31:04 +0000 (13:31 -0700)
committerTony Luck <tony.luck@intel.com>
Mon, 25 Apr 2005 20:31:04 +0000 (13:31 -0700)
commit605036cf8443b9172b24954dc1fd218e2049f91b
tree6c74011e73452ff0a4d3212fef5373b241a843b0
parentfc626b278a05a0fe3eb9abd1733120f2f400cbcd
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>
arch/ia64/Kconfig