diff options
Diffstat (limited to 'arch/ia64/configs')
-rw-r--r-- | arch/ia64/configs/bigsur_defconfig | 2 | ||||
-rw-r--r-- | arch/ia64/configs/generic_defconfig | 2 | ||||
-rw-r--r-- | arch/ia64/configs/gensparse_defconfig | 2 | ||||
-rw-r--r-- | arch/ia64/configs/sim_defconfig | 2 | ||||
-rw-r--r-- | arch/ia64/configs/tiger_defconfig | 1 | ||||
-rw-r--r-- | arch/ia64/configs/xen_domu_defconfig | 2 | ||||
-rw-r--r-- | arch/ia64/configs/zx1_defconfig | 2 |
7 files changed, 0 insertions, 13 deletions
diff --git a/arch/ia64/configs/bigsur_defconfig b/arch/ia64/configs/bigsur_defconfig index ace41096b47b..312b12094a1d 100644 --- a/arch/ia64/configs/bigsur_defconfig +++ b/arch/ia64/configs/bigsur_defconfig | |||
@@ -131,8 +131,6 @@ CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | |||
131 | CONFIG_ARCH_FLATMEM_ENABLE=y | 131 | CONFIG_ARCH_FLATMEM_ENABLE=y |
132 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 132 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
133 | # CONFIG_VIRTUAL_MEM_MAP is not set | 133 | # CONFIG_VIRTUAL_MEM_MAP is not set |
134 | CONFIG_IA32_SUPPORT=y | ||
135 | CONFIG_COMPAT=y | ||
136 | # CONFIG_IA64_MCA_RECOVERY is not set | 134 | # CONFIG_IA64_MCA_RECOVERY is not set |
137 | CONFIG_PERFMON=y | 135 | CONFIG_PERFMON=y |
138 | CONFIG_IA64_PALINFO=y | 136 | CONFIG_IA64_PALINFO=y |
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 |
diff --git a/arch/ia64/configs/gensparse_defconfig b/arch/ia64/configs/gensparse_defconfig index e86fbd39c795..2dc185b0f9a3 100644 --- a/arch/ia64/configs/gensparse_defconfig +++ b/arch/ia64/configs/gensparse_defconfig | |||
@@ -139,8 +139,6 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y | |||
139 | CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y | 139 | CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y |
140 | CONFIG_NUMA=y | 140 | CONFIG_NUMA=y |
141 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | 141 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y |
142 | CONFIG_IA32_SUPPORT=y | ||
143 | CONFIG_COMPAT=y | ||
144 | CONFIG_IA64_MCA_RECOVERY=y | 142 | CONFIG_IA64_MCA_RECOVERY=y |
145 | CONFIG_PERFMON=y | 143 | CONFIG_PERFMON=y |
146 | CONFIG_IA64_PALINFO=y | 144 | CONFIG_IA64_PALINFO=y |
diff --git a/arch/ia64/configs/sim_defconfig b/arch/ia64/configs/sim_defconfig index 546a772f438e..21a23cdfd41c 100644 --- a/arch/ia64/configs/sim_defconfig +++ b/arch/ia64/configs/sim_defconfig | |||
@@ -130,8 +130,6 @@ CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | |||
130 | CONFIG_ARCH_FLATMEM_ENABLE=y | 130 | CONFIG_ARCH_FLATMEM_ENABLE=y |
131 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 131 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
132 | # CONFIG_VIRTUAL_MEM_MAP is not set | 132 | # CONFIG_VIRTUAL_MEM_MAP is not set |
133 | CONFIG_IA32_SUPPORT=y | ||
134 | CONFIG_COMPAT=y | ||
135 | # CONFIG_IA64_MCA_RECOVERY is not set | 133 | # CONFIG_IA64_MCA_RECOVERY is not set |
136 | # CONFIG_PERFMON is not set | 134 | # CONFIG_PERFMON is not set |
137 | CONFIG_IA64_PALINFO=m | 135 | CONFIG_IA64_PALINFO=m |
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig index c522edf23c62..c5a5ea9d54ae 100644 --- a/arch/ia64/configs/tiger_defconfig +++ b/arch/ia64/configs/tiger_defconfig | |||
@@ -154,7 +154,6 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y | |||
154 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 154 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
155 | CONFIG_VIRTUAL_MEM_MAP=y | 155 | CONFIG_VIRTUAL_MEM_MAP=y |
156 | CONFIG_HOLES_IN_ZONE=y | 156 | CONFIG_HOLES_IN_ZONE=y |
157 | # CONFIG_IA32_SUPPORT is not set | ||
158 | CONFIG_IA64_MCA_RECOVERY=y | 157 | CONFIG_IA64_MCA_RECOVERY=y |
159 | CONFIG_PERFMON=y | 158 | CONFIG_PERFMON=y |
160 | CONFIG_IA64_PALINFO=y | 159 | CONFIG_IA64_PALINFO=y |
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 | |||
200 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 200 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
201 | CONFIG_VIRTUAL_MEM_MAP=y | 201 | CONFIG_VIRTUAL_MEM_MAP=y |
202 | CONFIG_HOLES_IN_ZONE=y | 202 | CONFIG_HOLES_IN_ZONE=y |
203 | # CONFIG_IA32_SUPPORT is not set | ||
204 | # CONFIG_COMPAT_FOR_U64_ALIGNMENT is not set | ||
205 | CONFIG_IA64_MCA_RECOVERY=y | 203 | CONFIG_IA64_MCA_RECOVERY=y |
206 | CONFIG_PERFMON=y | 204 | CONFIG_PERFMON=y |
207 | CONFIG_IA64_PALINFO=y | 205 | CONFIG_IA64_PALINFO=y |
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig index 514f0635dafe..3cec65b534c2 100644 --- a/arch/ia64/configs/zx1_defconfig +++ b/arch/ia64/configs/zx1_defconfig | |||
@@ -150,8 +150,6 @@ CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y | |||
150 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 150 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
151 | CONFIG_VIRTUAL_MEM_MAP=y | 151 | CONFIG_VIRTUAL_MEM_MAP=y |
152 | CONFIG_HOLES_IN_ZONE=y | 152 | CONFIG_HOLES_IN_ZONE=y |
153 | CONFIG_IA32_SUPPORT=y | ||
154 | CONFIG_COMPAT=y | ||
155 | CONFIG_IA64_MCA_RECOVERY=y | 153 | CONFIG_IA64_MCA_RECOVERY=y |
156 | CONFIG_PERFMON=y | 154 | CONFIG_PERFMON=y |
157 | CONFIG_IA64_PALINFO=y | 155 | CONFIG_IA64_PALINFO=y |