[oe-commits] org.oe.dev merge of '2cede492dcacf2a0da5e0cdd419d41a41086b31d'

[oe commit]

merge of '2cede492dcacf2a0da5e0cdd419d41a41086b31d'
     and 'caed22d9772a0d7a62f8adfe699c9a254859aae1'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 35963985c4abdc1cadcdd1d173bfafdda771e76a
ViewMTN: http://monotone.openembedded.org/revision/info/35963985c4abdc1cadcdd1d173bfafdda771e76a
Files:
1
packages/xorg-xserver/gumstix-kmode.patch
packages/xorg-xserver/xserver-kdrive/gumstix-kmode.patch
conf/machine/include/zaurus-2.6.inc
Diffs:

#
# mt diff -r2cede492dcacf2a0da5e0cdd419d41a41086b31d -r35963985c4abdc1cadcdd1d173bfafdda771e76a
#
# 
# 
# rename "packages/xorg-xserver/gumstix-kmode.patch"
#     to "packages/xorg-xserver/xserver-kdrive/gumstix-kmode.patch"
# 


#
# mt diff -rcaed22d9772a0d7a62f8adfe699c9a254859aae1 -r35963985c4abdc1cadcdd1d173bfafdda771e76a
#
# 
# 
# patch "conf/machine/include/zaurus-2.6.inc"
#  from [7baf3e010a9649ace2bc8172df240209ae4c83f0]
#    to [6fd05921765dc1975a082049180e563ef15d17ae]
# 
============================================================
--- conf/machine/include/zaurus-2.6.inc	7baf3e010a9649ace2bc8172df240209ae4c83f0
+++ conf/machine/include/zaurus-2.6.inc	6fd05921765dc1975a082049180e563ef15d17ae
@@ -21,8 +21,9 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 SERIAL_CONSOLE = "115200 ttyS0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
+
 PCMCIA_MANAGER ?= "pcmciautils"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen"