From: Koen Kooi <koen@openembedded.org>
Date: Fri, 12 Oct 2007 11:37:45 +0000 (+0000)
Subject: propagate from branch 'org.openembedded.dev' (head 7c2dfd8725acfc6de0286a17d58cccbfa6... 
X-Git-Tag: Release-2010-05/1~7838^2~16^2~2^2^2^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c5df3f485ba9992931e06d07f28c57a29d89e5e;p=openembedded.git

propagate from branch 'org.openembedded.dev' (head 7c2dfd8725acfc6de0286a17d58cccbfa6c141f8)
            to branch 'org.openembedded.dev.avr32' (head 6a2246abf3d894c89fc60280e99b73072b879e02)
---

1c5df3f485ba9992931e06d07f28c57a29d89e5e
diff --cc packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index e49650dc61,3cc67078a0..7822e4079a
--- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@@ -19,8 -19,9 +19,10 @@@ SRC_URI = "${XORG_MIRROR}/individual/xs
  	file://w100.patch;patch=1 \
  	file://w100-autofoo.patch;patch=1 \
  	file://w100-fix-offscreen-bmp.patch;patch=1 \
- 	file://xorg-avr32-support.diff;patch=1 \
-         "
 -        file://kdrive-1.3-18bpp.patch;patch=1 \
 -        file://gumstix-kmode.patch;patch=1 \
++    file://xorg-avr32-support.diff;patch=1 \
++    file://kdrive-1.3-18bpp.patch;patch=1 \
++    file://gumstix-kmode.patch;patch=1 \
+ "
  
  S = "${WORKDIR}/xorg-server-${PV}"