]> git.karo-electronics.de Git - karo-tx-linux.git/commit
powerpc/cpm: Reintroduce global spi_pram struct (fixes build issue)
authorAnton Vorontsov <avorontsov@mvista.com>
Thu, 8 Jul 2010 17:16:10 +0000 (21:16 +0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 2 Aug 2010 17:29:50 +0000 (10:29 -0700)
commitdc1671aaead838d5a3ed5a69317c73e0a18c9546
tree244bd2b3386f4b87b5e1982ac1f880097482391a
parentbe493139aa880313453313a426a12b13a6b084b7
powerpc/cpm: Reintroduce global spi_pram struct (fixes build issue)

commit 56825c88ff438f4dbb51a44591cc29e707fe783a upstream.

spi_t was removed in commit 644b2a680ccc51a9ec4d6beb12e9d47d2dee98e2
("powerpc/cpm: Remove SPI defines and spi structs"), the commit assumed
that spi_t isn't used anywhere outside of the spi_mpc8xxx driver. But
it appears that the struct is needed for micropatch code. So, let's
reintroduce the struct.

Fixes the following build issue:

    CC      arch/powerpc/sysdev/micropatch.o
  micropatch.c: In function 'cpm_load_patch':
  micropatch.c:629: error: expected '=', ',', ';', 'asm' or '__attribute__' before '*' token
  micropatch.c:629: error: 'spp' undeclared (first use in this function)
  micropatch.c:629: error: (Each undeclared identifier is reported only once
  micropatch.c:629: error: for each function it appears in.)

Reported-by: LEROY Christophe <christophe.leroy@c-s.fr>
Reported-by: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/powerpc/include/asm/cpm.h
arch/powerpc/sysdev/micropatch.c
drivers/spi/spi_mpc8xxx.c