diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index fcacfe291b9b7450b5537ec8cbb0aab258e92f5e..f1e7cc1389b01f53ad807f1a30f2a3cd317935d6 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -429,6 +429,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)
 
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index 9001b3fbaa3244c53a535fc62e23adef893a7166..327e1f511f8c9b1602d0056332d30c59f0863a7a 100644
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@ -144,6 +144,7 @@ CONFIG_COMPAT=y
 CONFIG_IA64_MCA_RECOVERY=y
 CONFIG_PERFMON=y
 CONFIG_IA64_PALINFO=y
+# CONFIG_MC_ERR_INJECT is not set
 CONFIG_SGI_SN=y
 
 #