diff mbox series

media/platform: fsl-viu.c: fix build for MICROBLAZE

Message ID 6dad6b40-19b9-b2da-3549-0484f961ea2f@infradead.org (mailing list archive)
State New, archived
Headers show
Series media/platform: fsl-viu.c: fix build for MICROBLAZE | expand

Commit Message

Randy Dunlap Aug. 6, 2019, 10:01 p.m. UTC 
From: Randy Dunlap <rdunlap@infradead.org>

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>
Cc: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
 drivers/media/platform/fsl-viu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

--- lnx-53-rc3.orig/drivers/media/platform/fsl-viu.c
+++ lnx-53-rc3/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