diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 07:22:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 07:22:51 -0800 |
| commit | 2656c076e31a3ce3ab2a987a578e7122dc2af51d (patch) | |
| tree | 98ee4e9c816191c72fc7faaf1934f6c4e5e1f3d6 /arch/powerpc/configs/pseries_defconfig | |
| parent | 811803c5572b296e0031e0099203de90d77c7bcf (diff) | |
| parent | f365cfd0d8b6d8fb3583d23d48f54efa88ee8563 (diff) | |
| download | talos-op-linux-2656c076e31a3ce3ab2a987a578e7122dc2af51d.tar.gz talos-op-linux-2656c076e31a3ce3ab2a987a578e7122dc2af51d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/configs/pseries_defconfig')
| -rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index b4745c918a4a..b589b196eb3f 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig @@ -165,7 +165,6 @@ CONFIG_SPARSEMEM_EXTREME=y # CONFIG_MEMORY_HOTPLUG is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y -CONFIG_NODES_SPAN_OTHER_NODES=y # CONFIG_PPC_64K_PAGES is not set CONFIG_SCHED_SMT=y CONFIG_PROC_DEVICETREE=y |
