diff options
| author | Tony Luck <tony.luck@intel.com> | 2010-02-26 15:04:13 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2010-02-26 15:04:13 -0500 |
| commit | 8d6339b8a532ec4eeb31db321cf1e6068965deda (patch) | |
| tree | 0fa1d7aa14d3dcc6f6ac5236ba14649fd9a0d5e6 /arch/ia64/configs/generic_defconfig | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
| parent | 32974ad4907cdde6c9de612cd1b2ee0568fb9409 (diff) | |
Pull rmia32 into release branch
Diffstat (limited to 'arch/ia64/configs/generic_defconfig')
| -rw-r--r-- | arch/ia64/configs/generic_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig index 75645495c2dd..6a4cc506fb5f 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_defconfig | |||
| @@ -205,8 +205,6 @@ CONFIG_VIRTUAL_MEM_MAP=y | |||
| 205 | CONFIG_HOLES_IN_ZONE=y | 205 | CONFIG_HOLES_IN_ZONE=y |
| 206 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | 206 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y |
| 207 | CONFIG_HAVE_ARCH_NODEDATA_EXTENSION=y | 207 | CONFIG_HAVE_ARCH_NODEDATA_EXTENSION=y |
| 208 | CONFIG_IA32_SUPPORT=y | ||
| 209 | CONFIG_COMPAT=y | ||
| 210 | CONFIG_COMPAT_FOR_U64_ALIGNMENT=y | 208 | CONFIG_COMPAT_FOR_U64_ALIGNMENT=y |
| 211 | CONFIG_IA64_MCA_RECOVERY=y | 209 | CONFIG_IA64_MCA_RECOVERY=y |
| 212 | CONFIG_PERFMON=y | 210 | CONFIG_PERFMON=y |