From: Tony Luck <tony.luck@intel.com>
Date: Mon, 30 Apr 2007 20:55:43 +0000 (-0700)
Subject: Pull error-inject into release branch
X-Git-Tag: v2.6.22-rc1~817^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0cc09e295f346b7921e921f385fe5213472316a;p=linux-2.6

Pull error-inject into release branch
---

e0cc09e295f346b7921e921f385fe5213472316a
diff --cc arch/ia64/defconfig
index 153bfdc018,327e1f511f..90bd9601cd
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@@ -164,15 -144,8 +164,16 @@@ CONFIG_COMPAT=
  CONFIG_IA64_MCA_RECOVERY=y
  CONFIG_PERFMON=y
  CONFIG_IA64_PALINFO=y
+ # CONFIG_MC_ERR_INJECT is not set
  CONFIG_SGI_SN=y
 +# CONFIG_IA64_ESI is not set
 +
 +#
 +# SN Devices
 +#
 +CONFIG_SGI_IOC3=m
 +CONFIG_KEXEC=y
 +CONFIG_CRASH_DUMP=y
  
  #
  # Firmware Drivers