From: Kumar Gala <galak@kernel.crashing.org>
Date: Thu, 16 Oct 2008 05:02:39 +0000 (-0700)
Subject: mpc52xx_psc_spi: remove code associated with !CONFIG_PPC_MERGE
X-Git-Tag: v2.6.28-rc1~457
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62f9e8f15a95822e0a793090ff69b277690c6aa6;p=pandora-kernel.git

mpc52xx_psc_spi: remove code associated with !CONFIG_PPC_MERGE

Now that arch/ppc is gone we don't need CONFIG_PPC_MERGE anymore
remove the dead code associated with !CONFIG_PPC_MERGE.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: David Brownell <david-b@pacbell.net>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

Reading git-diff-tree failed