diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch index 4737040675..11d5546537 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From fc04acfd948ac99d04a5dc08c78f3b13bc0c5c41 Mon Sep 17 00:00:00 2001 | 1 | From ce3b8a230a3805c9b557c1f106795675bd034860 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 17 Aug 2020 10:50:51 -0700 | 3 | Date: Mon, 17 Aug 2020 10:50:51 -0700 |
4 | Subject: [PATCH] Avoid duplicate definitions of IOPortBase | 4 | Subject: [PATCH] Avoid duplicate definitions of IOPortBase |
@@ -10,26 +10,13 @@ compiler.h:528: multiple definition of `IOPortBase'; | |||
10 | 10 | ||
11 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | |||
13 | --- | 14 | --- |
14 | hw/xfree86/common/compiler.h | 2 +- | ||
15 | hw/xfree86/os-support/linux/lnx_video.c | 1 + | 15 | hw/xfree86/os-support/linux/lnx_video.c | 1 + |
16 | 2 files changed, 2 insertions(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+) |
17 | 17 | ||
18 | diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h | ||
19 | index 2b2008b..c7d617e 100644 | ||
20 | --- a/hw/xfree86/common/compiler.h | ||
21 | +++ b/hw/xfree86/common/compiler.h | ||
22 | @@ -525,7 +525,7 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset, | ||
23 | #define PORT_SIZE short | ||
24 | #endif | ||
25 | |||
26 | -_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ | ||
27 | +extern _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ | ||
28 | |||
29 | static __inline__ void | ||
30 | outb(unsigned PORT_SIZE port, unsigned char val) | ||
31 | diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c | 18 | diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c |
32 | index 04e4509..9dc7316 100644 | 19 | index fd83022..1d0d96e 100644 |
33 | --- a/hw/xfree86/os-support/linux/lnx_video.c | 20 | --- a/hw/xfree86/os-support/linux/lnx_video.c |
34 | +++ b/hw/xfree86/os-support/linux/lnx_video.c | 21 | +++ b/hw/xfree86/os-support/linux/lnx_video.c |
35 | @@ -78,6 +78,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) | 22 | @@ -78,6 +78,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) |
@@ -40,6 +27,3 @@ index 04e4509..9dc7316 100644 | |||
40 | 27 | ||
41 | #if defined(__powerpc__) | 28 | #if defined(__powerpc__) |
42 | volatile unsigned char *ioBase = NULL; | 29 | volatile unsigned char *ioBase = NULL; |
43 | -- | ||
44 | 2.28.0 | ||
45 | |||