diff options
| author | Tony Luck <tony.luck@intel.com> | 2007-04-30 16:55:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-04-30 16:55:43 -0400 |
| commit | e0cc09e295f346b7921e921f385fe5213472316a (patch) | |
| tree | 3705c5bbd44afc235f39697a5b0c00d0d020188c /arch/ia64/defconfig | |
| parent | 40caf5ea5a7d47f8a33e26b63ca81dea4b5109d2 (diff) | |
| parent | e1b43bd556a611584a65f529e5077c1b54ace4f7 (diff) | |
Pull error-inject into release branch
Diffstat (limited to 'arch/ia64/defconfig')
| -rw-r--r-- | arch/ia64/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig index 153bfdc0182d..90bd9601cdde 100644 --- a/arch/ia64/defconfig +++ b/arch/ia64/defconfig | |||
| @@ -164,6 +164,7 @@ CONFIG_COMPAT=y | |||
| 164 | CONFIG_IA64_MCA_RECOVERY=y | 164 | CONFIG_IA64_MCA_RECOVERY=y |
| 165 | CONFIG_PERFMON=y | 165 | CONFIG_PERFMON=y |
| 166 | CONFIG_IA64_PALINFO=y | 166 | CONFIG_IA64_PALINFO=y |
| 167 | # CONFIG_MC_ERR_INJECT is not set | ||
| 167 | CONFIG_SGI_SN=y | 168 | CONFIG_SGI_SN=y |
| 168 | # CONFIG_IA64_ESI is not set | 169 | # CONFIG_IA64_ESI is not set |
| 169 | 170 | ||