summaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2013-06-01 23:27:00 +0200
committerMark Brown <broonie@linaro.org>2013-06-01 23:17:06 +0100
commit9cda8ad55207afbab28d8e6eae9670044187a324 (patch)
tree18d80d86afd89e7f44d7495116230e7a9e7230d4 /arch/blackfin
parent15502e0ca0da651b48c7def2983e7bb464349b2a (diff)
downloadlinux-9cda8ad55207afbab28d8e6eae9670044187a324.tar.bz2
blackfin: bf533-stamp: Remove bogus "||"
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> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/mach-bf533/boards/stamp.c2
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 1ea1dda98ad7..4a8c2e3fd7e5 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>