]> git.proxmox.com Git - mirror_ubuntu-kernels.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)
committerKumar Gala <galak@kernel.crashing.org>
Sun, 11 Jul 2010 16:03:22 +0000 (11:03 -0500)
commit56825c88ff438f4dbb51a44591cc29e707fe783a
tree766611bf5fa245863eeabfbe011991bf9b3eaf5c
parente467e104bb7482170b79f516d2025e7cfcaaa733
powerpc/cpm: Reintroduce global spi_pram struct (fixes build issue)

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>
Cc: <stable@kernel.org> [ .33, .34 ]
Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
arch/powerpc/include/asm/cpm.h
arch/powerpc/sysdev/micropatch.c
drivers/spi/spi_mpc8xxx.c