Re: [PATCH -next] blackfin: bf533-stamp: Remove bogus "||"

[Lars-Peter Clausen <lars@metafoo.de>]

On 05/31/2013 11:40 AM, Geert Uytterhoeven wrote:
> arch/blackfin/mach-bf533/boards/stamp.c:545:2: error: operator '||' has no right operand
> arch/blackfin/mach-bf533/boards/stamp.c:662:3: error: 'bfin_snd_resources' undeclared here (not in a function)
> arch/blackfin/mach-bf533/boards/stamp.c:662:3: error: negative width in bit-field '<anonymous>'
> arch/blackfin/mach-bf533/boards/stamp.c:665:21: error: 'bfin_snd_data' undeclared here (not in a function)
> make[4]: *** [arch/blackfin/mach-bf533/boards/stamp.o] Error 1
> 
> Introduced by commit 15502e0ca0da651b48c7def2983e7bb464349b2a ("blackfin:
> Remove references to the bf5x_tdm driver"), which removed two config
> options, but only one "||".
> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Hm, right I missed that one, thanks.

Acked-by: Lars-Peter Clausen <lars@metafoo.de>

Mark can you queue it up in your topic/blackfin branch?

> ---
> http://kisskb.ellerman.id.au/kisskb/buildresult/8848472/
> 
>  arch/blackfin/mach-bf533/boards/stamp.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
> index 1ea1dda..4a8c2e3 100644
> --- a/arch/blackfin/mach-bf533/boards/stamp.c
> +++ b/arch/blackfin/mach-bf533/boards/stamp.c
> @@ -542,7 +542,7 @@ static struct platform_device bfin_dpmc = {
>  };
>  
>  #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \
> -	|| defined(CONFIG_SND_BF5XX_AC97) || \
> +	defined(CONFIG_SND_BF5XX_AC97) || \
>  	defined(CONFIG_SND_BF5XX_AC97_MODULE)
>  
>  #include <asm/bfin_sport.h>