diff options
author | David Howells <dhowells@redhat.com> | 2006-12-05 12:01:28 -0500 |
---|---|---|
committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 12:01:28 -0500 |
commit | 9db73724453a9350e1c22dbe732d427e2939a5c9 (patch) | |
tree | 15e3ead6413ae97398a54292acc199bee0864d42 /arch/powerpc/configs/cell_defconfig | |
parent | 4c1ac1b49122b805adfa4efc620592f68dccf5db (diff) | |
parent | e62438630ca37539c8cc1553710bbfaa3cf960a7 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/ata/libata-scsi.c
include/linux/libata.h
Futher merge of Linus's head and compilation fixups.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/powerpc/configs/cell_defconfig')
-rw-r--r-- | arch/powerpc/configs/cell_defconfig | 50 |
1 files changed, 40 insertions, 10 deletions
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig index 0aba06d7d2ec..a98c982c73ad 100644 --- a/arch/powerpc/configs/cell_defconfig +++ b/arch/powerpc/configs/cell_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.18 | 3 | # Linux kernel version: 2.6.19-rc6 |
4 | # Wed Oct 4 15:30:50 2006 | 4 | # Wed Nov 22 15:33:04 2006 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
@@ -32,6 +32,10 @@ CONFIG_AUDIT_ARCH=y | |||
32 | CONFIG_POWER3=y | 32 | CONFIG_POWER3=y |
33 | CONFIG_POWER4=y | 33 | CONFIG_POWER4=y |
34 | CONFIG_PPC_FPU=y | 34 | CONFIG_PPC_FPU=y |
35 | # CONFIG_PPC_DCR_NATIVE is not set | ||
36 | CONFIG_PPC_DCR_MMIO=y | ||
37 | CONFIG_PPC_DCR=y | ||
38 | CONFIG_PPC_OF_PLATFORM_PCI=y | ||
35 | CONFIG_ALTIVEC=y | 39 | CONFIG_ALTIVEC=y |
36 | CONFIG_PPC_STD_MMU=y | 40 | CONFIG_PPC_STD_MMU=y |
37 | CONFIG_VIRT_CPU_ACCOUNTING=y | 41 | CONFIG_VIRT_CPU_ACCOUNTING=y |
@@ -67,7 +71,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
67 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 71 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
68 | CONFIG_SYSCTL=y | 72 | CONFIG_SYSCTL=y |
69 | # CONFIG_EMBEDDED is not set | 73 | # CONFIG_EMBEDDED is not set |
70 | # CONFIG_SYSCTL_SYSCALL is not set | 74 | CONFIG_SYSCTL_SYSCALL=y |
71 | CONFIG_KALLSYMS=y | 75 | CONFIG_KALLSYMS=y |
72 | # CONFIG_KALLSYMS_ALL is not set | 76 | # CONFIG_KALLSYMS_ALL is not set |
73 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 77 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -131,6 +135,7 @@ CONFIG_PPC_CELL=y | |||
131 | CONFIG_PPC_CELL_NATIVE=y | 135 | CONFIG_PPC_CELL_NATIVE=y |
132 | CONFIG_PPC_IBM_CELL_BLADE=y | 136 | CONFIG_PPC_IBM_CELL_BLADE=y |
133 | CONFIG_UDBG_RTAS_CONSOLE=y | 137 | CONFIG_UDBG_RTAS_CONSOLE=y |
138 | CONFIG_PPC_PS3=y | ||
134 | # CONFIG_U3_DART is not set | 139 | # CONFIG_U3_DART is not set |
135 | CONFIG_PPC_RTAS=y | 140 | CONFIG_PPC_RTAS=y |
136 | # CONFIG_RTAS_ERROR_LOGGING is not set | 141 | # CONFIG_RTAS_ERROR_LOGGING is not set |
@@ -139,9 +144,23 @@ CONFIG_RTAS_FLASH=y | |||
139 | CONFIG_MMIO_NVRAM=y | 144 | CONFIG_MMIO_NVRAM=y |
140 | # CONFIG_PPC_MPC106 is not set | 145 | # CONFIG_PPC_MPC106 is not set |
141 | # CONFIG_PPC_970_NAP is not set | 146 | # CONFIG_PPC_970_NAP is not set |
142 | # CONFIG_CPU_FREQ is not set | 147 | CONFIG_PPC_INDIRECT_IO=y |
148 | CONFIG_GENERIC_IOMAP=y | ||
149 | CONFIG_CPU_FREQ=y | ||
150 | CONFIG_CPU_FREQ_TABLE=y | ||
151 | CONFIG_CPU_FREQ_DEBUG=y | ||
152 | CONFIG_CPU_FREQ_STAT=y | ||
153 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | ||
154 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | ||
155 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | ||
156 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | ||
157 | CONFIG_CPU_FREQ_GOV_POWERSAVE=y | ||
158 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | ||
159 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y | ||
160 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | ||
161 | # CONFIG_CPU_FREQ_PMAC64 is not set | ||
143 | # CONFIG_WANT_EARLY_SERIAL is not set | 162 | # CONFIG_WANT_EARLY_SERIAL is not set |
144 | # CONFIG_MPIC is not set | 163 | CONFIG_MPIC=y |
145 | 164 | ||
146 | # | 165 | # |
147 | # Cell Broadband Engine options | 166 | # Cell Broadband Engine options |
@@ -149,6 +168,15 @@ CONFIG_MMIO_NVRAM=y | |||
149 | CONFIG_SPU_FS=m | 168 | CONFIG_SPU_FS=m |
150 | CONFIG_SPU_BASE=y | 169 | CONFIG_SPU_BASE=y |
151 | CONFIG_CBE_RAS=y | 170 | CONFIG_CBE_RAS=y |
171 | CONFIG_CBE_THERM=m | ||
172 | CONFIG_CBE_CPUFREQ=m | ||
173 | |||
174 | # | ||
175 | # PS3 Platform Options | ||
176 | # | ||
177 | CONFIG_PS3_HTAB_SIZE=20 | ||
178 | # CONFIG_PS3_DYNAMIC_DMA is not set | ||
179 | CONFIG_PS3_USE_LPAR_ADDR=y | ||
152 | 180 | ||
153 | # | 181 | # |
154 | # Kernel options | 182 | # Kernel options |
@@ -166,13 +194,14 @@ CONFIG_BINFMT_MISC=m | |||
166 | CONFIG_FORCE_MAX_ZONEORDER=9 | 194 | CONFIG_FORCE_MAX_ZONEORDER=9 |
167 | # CONFIG_IOMMU_VMERGE is not set | 195 | # CONFIG_IOMMU_VMERGE is not set |
168 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 196 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
169 | CONFIG_KEXEC=y | 197 | # CONFIG_KEXEC is not set |
170 | # CONFIG_CRASH_DUMP is not set | 198 | # CONFIG_CRASH_DUMP is not set |
171 | CONFIG_IRQ_ALL_CPUS=y | 199 | CONFIG_IRQ_ALL_CPUS=y |
172 | CONFIG_NUMA=y | 200 | CONFIG_NUMA=y |
173 | CONFIG_NODES_SHIFT=4 | 201 | CONFIG_NODES_SHIFT=4 |
174 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 202 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
175 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 203 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
204 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | ||
176 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 205 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
177 | CONFIG_SELECT_MEMORY_MODEL=y | 206 | CONFIG_SELECT_MEMORY_MODEL=y |
178 | # CONFIG_FLATMEM_MANUAL is not set | 207 | # CONFIG_FLATMEM_MANUAL is not set |
@@ -189,6 +218,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
189 | CONFIG_MIGRATION=y | 218 | CONFIG_MIGRATION=y |
190 | CONFIG_RESOURCES_64BIT=y | 219 | CONFIG_RESOURCES_64BIT=y |
191 | CONFIG_ARCH_MEMORY_PROBE=y | 220 | CONFIG_ARCH_MEMORY_PROBE=y |
221 | CONFIG_NODES_SPAN_OTHER_NODES=y | ||
192 | CONFIG_PPC_64K_PAGES=y | 222 | CONFIG_PPC_64K_PAGES=y |
193 | CONFIG_SCHED_SMT=y | 223 | CONFIG_SCHED_SMT=y |
194 | CONFIG_PROC_DEVICETREE=y | 224 | CONFIG_PROC_DEVICETREE=y |
@@ -207,7 +237,6 @@ CONFIG_GENERIC_ISA_DMA=y | |||
207 | CONFIG_PCI=y | 237 | CONFIG_PCI=y |
208 | CONFIG_PCI_DOMAINS=y | 238 | CONFIG_PCI_DOMAINS=y |
209 | CONFIG_PCIEPORTBUS=y | 239 | CONFIG_PCIEPORTBUS=y |
210 | # CONFIG_PCI_MULTITHREAD_PROBE is not set | ||
211 | # CONFIG_PCI_DEBUG is not set | 240 | # CONFIG_PCI_DEBUG is not set |
212 | 241 | ||
213 | # | 242 | # |
@@ -280,7 +309,6 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
280 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 309 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
281 | # CONFIG_IPV6_SIT is not set | 310 | # CONFIG_IPV6_SIT is not set |
282 | CONFIG_IPV6_TUNNEL=m | 311 | CONFIG_IPV6_TUNNEL=m |
283 | # CONFIG_IPV6_SUBTREES is not set | ||
284 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 312 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
285 | # CONFIG_NETWORK_SECMARK is not set | 313 | # CONFIG_NETWORK_SECMARK is not set |
286 | CONFIG_NETFILTER=y | 314 | CONFIG_NETFILTER=y |
@@ -1107,7 +1135,8 @@ CONFIG_PLIST=y | |||
1107 | # | 1135 | # |
1108 | # Instrumentation Support | 1136 | # Instrumentation Support |
1109 | # | 1137 | # |
1110 | # CONFIG_PROFILING is not set | 1138 | CONFIG_PROFILING=y |
1139 | CONFIG_OPROFILE=y | ||
1111 | # CONFIG_KPROBES is not set | 1140 | # CONFIG_KPROBES is not set |
1112 | 1141 | ||
1113 | # | 1142 | # |
@@ -1142,6 +1171,7 @@ CONFIG_DEBUG_FS=y | |||
1142 | CONFIG_DEBUGGER=y | 1171 | CONFIG_DEBUGGER=y |
1143 | CONFIG_XMON=y | 1172 | CONFIG_XMON=y |
1144 | CONFIG_XMON_DEFAULT=y | 1173 | CONFIG_XMON_DEFAULT=y |
1174 | CONFIG_XMON_DISASSEMBLY=y | ||
1145 | CONFIG_IRQSTACKS=y | 1175 | CONFIG_IRQSTACKS=y |
1146 | # CONFIG_BOOTX_TEXT is not set | 1176 | # CONFIG_BOOTX_TEXT is not set |
1147 | # CONFIG_PPC_EARLY_DEBUG is not set | 1177 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -1159,7 +1189,7 @@ CONFIG_CRYPTO=y | |||
1159 | CONFIG_CRYPTO_ALGAPI=y | 1189 | CONFIG_CRYPTO_ALGAPI=y |
1160 | CONFIG_CRYPTO_BLKCIPHER=m | 1190 | CONFIG_CRYPTO_BLKCIPHER=m |
1161 | CONFIG_CRYPTO_HASH=y | 1191 | CONFIG_CRYPTO_HASH=y |
1162 | # CONFIG_CRYPTO_MANAGER is not set | 1192 | CONFIG_CRYPTO_MANAGER=y |
1163 | CONFIG_CRYPTO_HMAC=y | 1193 | CONFIG_CRYPTO_HMAC=y |
1164 | # CONFIG_CRYPTO_NULL is not set | 1194 | # CONFIG_CRYPTO_NULL is not set |
1165 | # CONFIG_CRYPTO_MD4 is not set | 1195 | # CONFIG_CRYPTO_MD4 is not set |