]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
mpc52xx_psc_spi: fix it for CONFIG_PPC_MERGE
authorDomen Puncer <domen@coderock.org>
Wed, 23 May 2007 20:57:32 +0000 (13:57 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 24 May 2007 03:14:11 +0000 (20:14 -0700)
commit8888735fcaac7681dbcca67fbcc88cf627c47b3a
tree1c3400a5c6fa6555174a1320e1a4de8538a800f4
parentb9ba347f27f2508e3da023688d047e111cbbe2da
mpc52xx_psc_spi: fix it for CONFIG_PPC_MERGE

Fix mpc5200 PSC SPI driver to actually work for CONFIG_PPC_MERGE
 - s/mpc52xx/mpc5200/, as this was changed in device tree some time ago
 - fix spi id detection

The move from 'ppc' to 'powerpc' didn't quite match the latest
kernel.org code.

Signed-off-by: Domen Puncer <domen.puncer@telargo.com>
Acked-by: Dragos Carp <dragos.carp@toptica.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/spi/mpc52xx_psc_spi.c