diff options
| author | Randy Dunlap <rdunlap@infradead.org> | 2019-08-06 19:01:36 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-05 13:13:35 +0200 |
| commit | ff45dc5d103f4db0051ff2e0b1ca7e32b39735fe (patch) | |
| tree | fa933d6949d514de547eb159561e27a4bfd8042b /drivers/media | |
| parent | c0053b3c614247a68fb76b9266e7722f38fde6d8 (diff) | |
| download | linux-stable-ff45dc5d103f4db0051ff2e0b1ca7e32b39735fe.tar.gz linux-stable-ff45dc5d103f4db0051ff2e0b1ca7e32b39735fe.tar.bz2 linux-stable-ff45dc5d103f4db0051ff2e0b1ca7e32b39735fe.zip | |
media: media/platform: fsl-viu.c: fix build for MICROBLAZE
[ Upstream commit 6898dd580a045341f844862ceb775144156ec1af ]
arch/microblaze/ defines out_be32() and in_be32(), so don't do that
again in the driver source.
Fixes these build warnings:
../drivers/media/platform/fsl-viu.c:36: warning: "out_be32" redefined
../arch/microblaze/include/asm/io.h:50: note: this is the location of the previous definition
../drivers/media/platform/fsl-viu.c:37: warning: "in_be32" redefined
../arch/microblaze/include/asm/io.h:53: note: this is the location of the previous definition
Fixes: 29d750686331 ("media: fsl-viu: allow building it with COMPILE_TEST")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/fsl-viu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c index 691be788e38b..b74e4f50d7d9 100644 --- a/drivers/media/platform/fsl-viu.c +++ b/drivers/media/platform/fsl-viu.c @@ -32,7 +32,7 @@ #define VIU_VERSION "0.5.1" /* Allow building this driver with COMPILE_TEST */ -#ifndef CONFIG_PPC +#if !defined(CONFIG_PPC) && !defined(CONFIG_MICROBLAZE) #define out_be32(v, a) iowrite32be(a, (void __iomem *)v) #define in_be32(a) ioread32be((void __iomem *)a) #endif |