[PATCH v2] ARM: zynq: fix "'IO_SPACE_LIMIT' redefined" warning

[PATCH v2] ARM: zynq: fix "'IO_SPACE_LIMIT' redefined" warning

[Antony Pavlov]

The patch fixes the following compiler's warning:

In file included from include/common.h:33:0,
                 from arch/arm/mach-zynq/zynq.c:18:
arch/arm/include/asm/io.h:4:0: warning: "IO_SPACE_LIMIT" redefined
 #define IO_SPACE_LIMIT 0

In file included from
arch/arm/mach-zynq/zynq.c:17:0:
include/asm-generic/io.h:92:0: note: this is the location of the previous definition
 #define IO_SPACE_LIMIT 0xffff

Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/arm/mach-zynq/zynq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-zynq/zynq.c b/arch/arm/mach-zynq/zynq.c
index a0a8d0d249..f6112fd249 100644
--- a/arch/arm/mach-zynq/zynq.c
+++ b/arch/arm/mach-zynq/zynq.c
@@ -14,7 +14,7 @@
  */
 
 #include <asm/system.h>
-#include <asm-generic/io.h>
+#include <io.h>
 #include <common.h>
 #include <init.h>
 #include <restart.h>
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH v2] ARM: zynq: fix "'IO_SPACE_LIMIT' redefined" warning

[Sascha Hauer]

On Tue, Jan 22, 2019 at 09:38:25PM +0300, Antony Pavlov wrote:
> The patch fixes the following compiler's warning:
> 
> In file included from include/common.h:33:0,
>                  from arch/arm/mach-zynq/zynq.c:18:
> arch/arm/include/asm/io.h:4:0: warning: "IO_SPACE_LIMIT" redefined
>  #define IO_SPACE_LIMIT 0
> 
> In file included from
> arch/arm/mach-zynq/zynq.c:17:0:
> include/asm-generic/io.h:92:0: note: this is the location of the previous definition
>  #define IO_SPACE_LIMIT 0xffff
> 
> Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> ---
>  arch/arm/mach-zynq/zynq.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox