summaryrefslogtreecommitdiff
path: root/conf/machine/include/zaurus-2.6.inc
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-10-18 19:29:43 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-10-18 19:29:43 +0000
commit1010441880aee280580534f0fb0a68e4a98eb375 (patch)
tree58800c7dbb1b770ab67a02fa08d9767f6fc9471c /conf/machine/include/zaurus-2.6.inc
parent7bcfa6ab969ca61e3bcde9eee3240f32f578d1e5 (diff)
parentfdb7f09ca89562f586e1d9a6235e6a72da1ff77b (diff)
merge of '947287d07500dfb42d1f2f6b23d0bcd2ed00c920'
and 'da91d7ddb56154d2bd01a37943cd55b4ba49ac8a'
Diffstat (limited to 'conf/machine/include/zaurus-2.6.inc')
-rw-r--r--conf/machine/include/zaurus-2.6.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 979a6bd484..4bcd36e2ab 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -21,7 +21,8 @@ include conf/machine/include/tune-xscale.inc
SERIAL_CONSOLE = "115200 ttyS0"
PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
PCMCIA_MANAGER ?= "pcmciautils"