git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
configs
/
tiger_defconfig
diff --git
a/arch/ia64/configs/tiger_defconfig
b/arch/ia64/configs/tiger_defconfig
index c522edf23c623732c06709cd05df178ac794d17e..c5a5ea9d54ae32910536d635ae8936501cd9f643 100644
(file)
--- a/
arch/ia64/configs/tiger_defconfig
+++ b/
arch/ia64/configs/tiger_defconfig
@@
-154,7
+154,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_IA64_MCA_RECOVERY=y
CONFIG_PERFMON=y
CONFIG_IA64_PALINFO=y