From dbc1c5c250cbedccf3571597d156e581e34b2944 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Mon, 20 Oct 2008 08:03:46 +0000 Subject: 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 Signed-off-by: Benjamin Herrenschmidt --- arch/powerpc/Kconfig | 3 --- 1 file changed, 3 deletions(-) (limited to 'arch/powerpc/Kconfig') diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index c171f5bcf25..bbe149c2651 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 -- cgit v1.2.3