diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 10:14:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 10:14:46 -0800 |
| commit | d03ab7ff335b7fbf48d0fd28ead5d7957798510b (patch) | |
| tree | 5a1080b6f51a51fd515a61c518d46f7f2676c139 /arch/ia64/configs/xen_domu_defconfig | |
| parent | 8098a7ef8946169cf8ffeb6f4d8130fc3651192e (diff) | |
| parent | 4d86e1b18d6de8446aa424b615b34e436d42c241 (diff) | |
| download | linux-d03ab7ff335b7fbf48d0fd28ead5d7957798510b.tar.gz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] wrong attribute of HUB chip written in uv_setup() [IA64] remove trailing space in messages [IA64] use asm-generic/scatterlist.h [IA64] build arch/ia64/kernel/acpi-ext.o when CONFIG_ACPI [IA64] Only build arch/ia64/kernel/acpi.o when CONFIG_ACPI [IA64] Remove COMPAT_IA32 support
Diffstat (limited to 'arch/ia64/configs/xen_domu_defconfig')
| -rw-r--r-- | arch/ia64/configs/xen_domu_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/configs/xen_domu_defconfig b/arch/ia64/configs/xen_domu_defconfig index 0bb0714dc19d..c67eafc4bb38 100644 --- a/arch/ia64/configs/xen_domu_defconfig +++ b/arch/ia64/configs/xen_domu_defconfig @@ -200,8 +200,6 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_VIRTUAL_MEM_MAP=y CONFIG_HOLES_IN_ZONE=y -# CONFIG_IA32_SUPPORT is not set -# CONFIG_COMPAT_FOR_U64_ALIGNMENT is not set CONFIG_IA64_MCA_RECOVERY=y CONFIG_PERFMON=y CONFIG_IA64_PALINFO=y |