Subject: Re: [PATCH] powerpc: Remove Kconfig support for PPC_MERGE

From: Benjamin Herrenschmidt <[email-masked]>
Date: Tue, 21 Oct 2008 10:56:20 +1100

On Mon, 2008-10-20 at 13:03 -0500, Kumar Gala wrote:
> 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.

That's is all good but shouldn't be in your git tree for merge.

Ben.

> Signed-off-by: Kumar Gala <[email-masked]>
> ---
>  arch/powerpc/Kconfig |    3 ---
>  1 files changed, 0 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> index 9391199..369d93e 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 ARCH_PHYS_ADDR_T_64BIT
>         def_bool PPC64 || PHYS_64BIT
>