summaryrefslogtreecommitdiff
path: root/recipes/xorg-xserver/files/xorg-avr32-support.diff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-06-07 10:17:43 +0200
committerKoen Kooi <koen@openembedded.org>2009-06-07 10:17:43 +0200
commit4e8dfb18de51e5c817c0bf5c45db00deabf18359 (patch)
tree423370f176fbbaab35dfabd068df094d7c16e199 /recipes/xorg-xserver/files/xorg-avr32-support.diff
parent4e9f655e60a5190cce98981328b725965ba57ede (diff)
parentead01d1ba1b934b89179a9c95a7613e48207429f (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/xorg-xserver/files/xorg-avr32-support.diff')
-rw-r--r--recipes/xorg-xserver/files/xorg-avr32-support.diff2
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes/xorg-xserver/files/xorg-avr32-support.diff b/recipes/xorg-xserver/files/xorg-avr32-support.diff
index dd7d379010..68320482b9 100644
--- a/recipes/xorg-xserver/files/xorg-avr32-support.diff
+++ b/recipes/xorg-xserver/files/xorg-avr32-support.diff
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22129
+
--- /tmp/servermd.h 2007-09-30 17:27:22.310911628 +0200
+++ xorg-server-1.4/include/servermd.h 2007-09-30 17:28:25.297799199 +0200
@@ -130,6 +130,16 @@