| Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 1 | From c2d730cf79eb3e4bea41f5ed8a8a21092ced8b03 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Hanno=20B=C3=B6ck?= <hanno@gentoo.org> |
| 3 | Date: Sun, 2 Feb 2020 14:18:39 +0100 |
| 4 | Subject: [PATCH] i810: Avoid duplicate definition of I810PatternROP |
| 5 | |
| 6 | Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/commit/652d93cbbdc159c0883f1b626ea48e28bac63ae3] |
| 7 | Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | --- |
| 10 | src/legacy/i810/i810.h | 2 +- |
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 12 | |
| 13 | diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h |
| 14 | index 347188c9..19be049c 100644 |
| 15 | --- a/src/legacy/i810/i810.h |
| 16 | +++ b/src/legacy/i810/i810.h |
| 17 | @@ -322,6 +322,6 @@ extern void I810InitMC(ScreenPtr pScreen); |
| 18 | extern const OptionInfoRec *I810AvailableOptions(int chipid, int busid); |
| 19 | |
| 20 | extern const int I810CopyROP[16]; |
| 21 | -const int I810PatternROP[16]; |
| 22 | +extern const int I810PatternROP[16]; |
| 23 | |
| 24 | #endif /* _I810_H_ */ |
| 25 | -- |
| 26 | 2.28.0 |
| 27 | |