summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-10-20 10:03:46 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-21 06:19:11 +0200
commitdbc1c5c250cbedccf3571597d156e581e34b2944 (patch)
tree771df5aa8e938a6caf35bd06a9e9be6589421b84 /arch
parentpowerpc: Fix build issue with CONFIG_RELOCATABLE=y (diff)
downloadlinux-dbc1c5c250cbedccf3571597d156e581e34b2944.tar.xz
linux-dbc1c5c250cbedccf3571597d156e581e34b2944.zip
powerpc: Remove Kconfig support for PPC_MERGE
There are no users of PPC_MERGE in tree so we can get rid of it. It was a hold over from the arch/ppc days. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/Kconfig3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c171f5bcf258..bbe149c26518 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -19,9 +19,6 @@ config WORD_SIZE
default 64 if PPC64
default 32 if !PPC64
-config PPC_MERGE
- def_bool y
-
config MMU
bool
default y