lkml.org 
[lkml]   [2010]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[084/140] powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations
    2.6.33-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Anton Vorontsov <avorontsov@mvista.com>

    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 | 5 +++++
    1 file changed, 5 insertions(+)

    --- a/arch/powerpc/sysdev/micropatch.c
    +++ b/arch/powerpc/sysdev/micropatch.c
    @@ -626,9 +626,14 @@ cpm_load_patch(cpm8xx_t *cp)
    {
    volatile uint *dp; /* Dual-ported RAM. */
    volatile cpm8xx_t *commproc;
    +#if defined(CONFIG_I2C_SPI_UCODE_PATCH) || \
    + defined(CONFIG_I2C_SPI_SMC1_UCODE_PATCH)
    volatile iic_t *iip;
    volatile struct spi_pram *spp;
    +#ifdef CONFIG_I2C_SPI_SMC1_UCODE_PATCH
    volatile smc_uart_t *smp;
    +#endif
    +#endif
    int i;

    commproc = cp;



    \
     
     \ /
      Last update: 2010-07-30 19:55    [W:3.418 / U:0.348 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site