diff options
| author |   Tony Luck <tony.luck@intel.com> | 2007-04-30 13:55:43 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-04-30 13:55:43 -0700 |
| commit | e0cc09e295f346b7921e921f385fe5213472316a (patch) | |
| tree | 3705c5bbd44afc235f39697a5b0c00d0d020188c /arch/ia64/defconfig | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 (diff) | |
| parent | [IA64] Fix example error injection program (diff) | |
| download | linux-dev-e0cc09e295f346b7921e921f385fe5213472316a.tar.xz linux-dev-e0cc09e295f346b7921e921f385fe5213472316a.zip | |
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 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 |