mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-01 13:58:04 +00:00
907f8a2461
(From OE-Core rev: 78dc14599a65075a40c26df4bf9d2bb33a237ca9) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From cedc797e1a0850039a25b7e387b342e54fffcc97 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Mon, 17 Aug 2020 10:50:51 -0700
|
|
Subject: [PATCH] Avoid duplicate definitions of IOPortBase
|
|
|
|
This fixed build with gcc10/-fno-common
|
|
|
|
Fixes
|
|
compiler.h:528: multiple definition of `IOPortBase';
|
|
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
hw/xfree86/os-support/linux/lnx_video.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
|
|
index fd83022..1d0d96e 100644
|
|
--- a/hw/xfree86/os-support/linux/lnx_video.c
|
|
+++ b/hw/xfree86/os-support/linux/lnx_video.c
|
|
@@ -78,6 +78,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
|
|
/***************************************************************************/
|
|
/* I/O Permissions section */
|
|
/***************************************************************************/
|
|
+_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
|
|
|
|
#if defined(__powerpc__)
|
|
volatile unsigned char *ioBase = NULL;
|