mpc52xx_psc_spi: remove code associated with !CONFIG_PPC_MERGE
authorKumar Gala <galak@kernel.crashing.org>
Thu, 16 Oct 2008 05:02:39 +0000 (22:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Oct 2008 18:21:38 +0000 (11:21 -0700)
commit62f9e8f15a95822e0a793090ff69b277690c6aa6
tree3dff2c2cc85cb7bb0a85c138f4d65d655ed1f8a8
parentbf2a9a39639b8b51377905397a5005f444e9a892
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>
drivers/spi/mpc52xx_psc_spi.c