projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
ia64
/
configs
/
sim_defconfig
diff --git
a/arch/ia64/configs/sim_defconfig
b/arch/ia64/configs/sim_defconfig
index
546a772
..
21a23cd
100644
(file)
--- a/
arch/ia64/configs/sim_defconfig
+++ b/
arch/ia64/configs/sim_defconfig
@@
-130,8
+130,6
@@
CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
# CONFIG_VIRTUAL_MEM_MAP is not set
-CONFIG_IA32_SUPPORT=y
-CONFIG_COMPAT=y
# CONFIG_IA64_MCA_RECOVERY is not set
# CONFIG_PERFMON is not set
CONFIG_IA64_PALINFO=m