aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/ia64/Kconfig10
-rw-r--r--arch/ia64/defconfig1
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index fcacfe291b9b..f1e7cc1389b0 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -429,6 +429,16 @@ config IA64_PALINFO
429 To use this option, you have to ensure that the "/proc file system 429 To use this option, you have to ensure that the "/proc file system
430 support" (CONFIG_PROC_FS) is enabled, too. 430 support" (CONFIG_PROC_FS) is enabled, too.
431 431
432config IA64_MC_ERR_INJECT
433 tristate "MC error injection support"
434 help
435 Selets whether support for MC error injection. By enabling the
436 support, kernel provide sysfs interface for user application to
437 call MC error injection PAL procedure to inject various errors.
438 This is a useful tool for MCA testing.
439
440 If you're unsure, do not select this option.
441
432config SGI_SN 442config SGI_SN
433 def_bool y if (IA64_SGI_SN2 || IA64_GENERIC) 443 def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)
434 444
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index 9001b3fbaa32..327e1f511f8c 100644
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@ -144,6 +144,7 @@ CONFIG_COMPAT=y
144CONFIG_IA64_MCA_RECOVERY=y 144CONFIG_IA64_MCA_RECOVERY=y
145CONFIG_PERFMON=y 145CONFIG_PERFMON=y
146CONFIG_IA64_PALINFO=y 146CONFIG_IA64_PALINFO=y
147# CONFIG_MC_ERR_INJECT is not set
147CONFIG_SGI_SN=y 148CONFIG_SGI_SN=y
148 149
149# 150#