[patch 1/1] powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks

[Benjamin Herrenschmidt]

On Mon, 2008-09-22 at 14:41 -0700, akpm at linux-foundation.org wrote:
> From: Kumar Gala <galak at kernel.crashing.org>
> 
> Now that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all
> powerpc platforms and we want to get rid of CONFIG_PPC_MERGE use
> CONFIG_PPC instead.
> 
> Signed-off-by: Kumar Gala <galak at kernel.crashing.org>

Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>

> Cc: Paul Mackerras <paulus at samba.org>
> Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
> ---