diff options
Diffstat (limited to 'arch/powerpc/configs/pseries_defconfig')
-rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index 913962c1dae0..b589b196eb3f 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_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.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc1 |
4 | # Mon Nov 14 15:27:00 2005 | 4 | # Tue Nov 15 14:36:55 2005 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
@@ -144,7 +144,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 | |||
144 | CONFIG_IOMMU_VMERGE=y | 144 | CONFIG_IOMMU_VMERGE=y |
145 | CONFIG_HOTPLUG_CPU=y | 145 | CONFIG_HOTPLUG_CPU=y |
146 | CONFIG_KEXEC=y | 146 | CONFIG_KEXEC=y |
147 | # CONFIG_IRQ_ALL_CPUS is not set | 147 | CONFIG_IRQ_ALL_CPUS=y |
148 | CONFIG_PPC_SPLPAR=y | 148 | CONFIG_PPC_SPLPAR=y |
149 | CONFIG_EEH=y | 149 | CONFIG_EEH=y |
150 | CONFIG_SCANLOG=m | 150 | CONFIG_SCANLOG=m |
@@ -165,7 +165,6 @@ CONFIG_SPARSEMEM_EXTREME=y | |||
165 | # CONFIG_MEMORY_HOTPLUG is not set | 165 | # CONFIG_MEMORY_HOTPLUG is not set |
166 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 166 | CONFIG_SPLIT_PTLOCK_CPUS=4096 |
167 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | 167 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y |
168 | CONFIG_NODES_SPAN_OTHER_NODES=y | ||
169 | # CONFIG_PPC_64K_PAGES is not set | 168 | # CONFIG_PPC_64K_PAGES is not set |
170 | CONFIG_SCHED_SMT=y | 169 | CONFIG_SCHED_SMT=y |
171 | CONFIG_PROC_DEVICETREE=y | 170 | CONFIG_PROC_DEVICETREE=y |