public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Lars-Peter Clausen <lars@metafoo.de>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Mark Brown <broonie@kernel.org>,
	Mike Frysinger <vapier@gentoo.org>,
	uclinux-dist-devel@blackfin.uclinux.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH -next] blackfin: bf533-stamp: Remove bogus "||"
Date: Fri, 31 May 2013 13:40:47 +0200	[thread overview]
Message-ID: <51A88C3F.5080109@metafoo.de> (raw)
In-Reply-To: <1369993250-6461-1-git-send-email-geert@linux-m68k.org>

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>

(resend with Mark's new E-Mail address)

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>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

  parent reply	other threads:[~2013-05-31 11:41 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-31  9:40 [PATCH -next] blackfin: bf533-stamp: Remove bogus "||" Geert Uytterhoeven
2013-05-31 11:37 ` Lars-Peter Clausen
2013-05-31 11:40 ` Lars-Peter Clausen [this message]
2013-06-01 19:03   ` Mark Brown
2013-06-01 20:48     ` Geert Uytterhoeven
2013-06-01 21:10       ` Mark Brown
2013-06-01 21:29         ` Geert Uytterhoeven
2013-06-01 22:06           ` Mark Brown
2013-06-02  8:04             ` Geert Uytterhoeven
2013-06-02 10:33               ` Mark Brown
2013-05-31 18:33 ` Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=51A88C3F.5080109@metafoo.de \
    --to=lars@metafoo.de \
    --cc=broonie@kernel.org \
    --cc=geert@linux-m68k.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=uclinux-dist-devel@blackfin.uclinux.org \
    --cc=vapier@gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox