xserver-kdrive: mark merged patches

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4318 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
index 8ae7f6b888a25583f28b0ad10965237ab85a03f1..611c94c50a3468aaa6a05c3647aa205398877c1b 100644 (file)
--- a/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
@@ -13,7 +13,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        file://no-serial-probing.patch;patch=1 \
        file://fbdev-not-fix.patch;patch=1  \
        file://optional-xkb.patch;patch=1 \
-       file://enable-tslib.patch;patch=1 \
+       file://enable-tslib.patch;patch=1;merged \
        file://kmode-palm.patch;patch=1 \
        file://enable-epson.patch;patch=1 \
         file://fix_default_mode.patch;patch=1 \
@@ -25,12 +25,12 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        file://w100-new-input-world-order.patch;patch=1 \
        file://linux-keyboard-mediumraw.patch;patch=1 \
        file://xcalibrate-new-input-world-order.patch;patch=1 \
-       file://tslib-default-device.patch;patch=1 \
+       file://tslib-default-device.patch;patch=1;merged \
 #      file://fbdev-evdev.patch;patch=1 \
        file://keyboard-resume-workaround.patch;patch=1 \
-       file://xorg-avr32-support.diff;patch=1 \
+       file://xorg-avr32-support.diff;patch=1;merged \
 #      file://pkgconfig_fix.patch;patch=1 \
-       file://no_xkb.patch;patch=1;pnum=0 \
+       file://no_xkb.patch;patch=1;pnum=0;merged \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"