From: Kumar Gala <galak@kernel.crashing.org>
Date: Fri, 1 Aug 2008 16:44:11 +0000 (+1000)
Subject: powerpc: Remove use of CONFIG_PPC_MERGE
X-Git-Tag: v2.6.27-rc2~43^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c4cb82515130c62224e23fdf7c13c8f6c59c614;p=pandora-kernel.git

powerpc: Remove use of CONFIG_PPC_MERGE

Now that arch/ppc is gone and CONFIG_PPC_MERGE is always set, remove
the dead code associated with !CONFIG_PPC_MERGE from arch/powerpc
and include/asm-powerpc.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

Reading git-diff-tree failed