projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Auto merge with /home/aegl/GIT/linus
[powerpc.git]
/
arch
/
ppc64
/
configs
/
pSeries_defconfig
diff --git
a/arch/ppc64/configs/pSeries_defconfig
b/arch/ppc64/configs/pSeries_defconfig
index
3eb5ef2
..
d0db8b5
100644
(file)
--- a/
arch/ppc64/configs/pSeries_defconfig
+++ b/
arch/ppc64/configs/pSeries_defconfig
@@
-88,7
+88,7
@@
CONFIG_IBMVIO=y
CONFIG_IOMMU_VMERGE=y
CONFIG_SMP=y
CONFIG_NR_CPUS=128
-CONFIG_
DISCONTIGMEM
=y
+CONFIG_
ARCH_DISCONTIGMEM_ENABLE
=y
CONFIG_NUMA=y
CONFIG_SCHED_SMT=y
# CONFIG_PREEMPT is not set