]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations
authorAnton Vorontsov <avorontsov@mvista.com>
Thu, 8 Jul 2010 17:16:14 +0000 (21:16 +0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 2 Aug 2010 17:26:39 +0000 (10:26 -0700)
commitc8921c571f69231934880c8f294611c5f1b5e494
treea9bbab1793c6b10776b066896651c95996f91588
parentbb5594c805d9b8857fc37a83a2b13ef45ba1a25a
powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations

commit 2069a6ae19a34d96cc9cb284eb645b165138e03f upstream.

Warnings are treated as errors for arch/powerpc code, so build fails
with CONFIG_I2C_SPI_UCODE_PATCH=y:

    CC      arch/powerpc/sysdev/micropatch.o
  cc1: warnings being treated as errors
  arch/powerpc/sysdev/micropatch.c: In function 'cpm_load_patch':
  arch/powerpc/sysdev/micropatch.c:630: warning: unused variable 'smp'
  make[1]: *** [arch/powerpc/sysdev/micropatch.o] Error 1

And with CONFIG_USB_SOF_UCODE_PATCH=y:

  CC      arch/powerpc/sysdev/micropatch.o
  cc1: warnings being treated as errors
  arch/powerpc/sysdev/micropatch.c: In function 'cpm_load_patch':
  arch/powerpc/sysdev/micropatch.c:629: warning: unused variable 'spp'
  arch/powerpc/sysdev/micropatch.c:628: warning: unused variable 'iip'
  make[1]: *** [arch/powerpc/sysdev/micropatch.o] Error 1

This patch fixes these issues by introducing proper #ifdefs.

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/sysdev/micropatch.c