X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=arch%2Fia64%2FKconfig;h=09866581a3266f90ffab3160812ace8b332efdaf;hb=e0cc09e295f346b7921e921f385fe5213472316a;hp=d51f0f11f7f95169f424cd99768928635be92dd3;hpb=4935361766cc73949fe032cd157d314f288922ba;p=~andy%2Flinux

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index d51f0f11f7f..09866581a32 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -13,6 +13,7 @@ config IA64
 	bool
 	select PCI if (!IA64_HP_SIM)
 	select ACPI if (!IA64_HP_SIM)
+	select PM if (!IA64_HP_SIM)
 	default y
 	help
 	  The Itanium Processor Family is Intel's 64-bit successor to
@@ -437,6 +438,16 @@ config IA64_PALINFO
 	  To use this option, you have to ensure that the "/proc file system
 	  support" (CONFIG_PROC_FS) is enabled, too.
 
+config IA64_MC_ERR_INJECT
+	tristate "MC error injection support"
+	help
+	  Selets whether support for MC error injection. By enabling the
+	  support, kernel provide sysfs interface for user application to
+	  call MC error injection PAL procedure to inject various errors.
+	  This is a useful tool for MCA testing.
+
+	  If you're unsure, do not select this option.
+
 config SGI_SN
 	def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)