From: Kumar Gala <galak@kernel.crashing.org>
Date: Mon, 22 Sep 2008 21:47:33 +0000 (-0700)
Subject: pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC
X-Git-Tag: v2.6.28-rc1~736^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47d692a946f12c299c21536fff6b39369311f002;p=pandora-kernel.git

pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC

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@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

Reading git-diff-tree failed