diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-07 12:04:29 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-07 12:04:29 +0000 |
| commit | 13768a336a8a1d956b828007d4e29b7cd9849c84 (patch) | |
| tree | d3865b2a77bf29f74678e1d8bbc8b6c08c5ee33b /conf | |
| parent | f569da00fa19ad423e53305613c983591f37a4a4 (diff) | |
| parent | 1f149ef1d7e7f73f95bd7b463855f765328e6912 (diff) | |
merge of '2690e38f2d62247f95e1eb15274c21741004c97e'
and '87e7a524e83ef079ad7118cfaeac8180944da275'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/preferred-xorg-versions-X11R7.3.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index cdf2970201..55ff9c93d0 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -8,7 +8,7 @@ # Use Xorg R7.3 release -require conf/distro/include/preferred-xorg-versions-X11R7.2.inc +require conf/distro/include/preferred-xorg-versions-X11R7.3.inc # This is a testbed for unstable and/or untested things, while angstrom-2007.1 diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc index 19ee48174d..d7e19284bc 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc @@ -71,7 +71,7 @@ PREFERRED_VERSION_xcursorgen ?= "1.0.2" PREFERRED_VERSION_xdbedizzy ?= "1.0.2" PREFERRED_VERSION_xditview ?= "1.0.1" PREFERRED_VERSION_xdm ?= "1.1.6" -PREFERRED_VERSION_xdpyinfo ?= "1.0.1" +PREFERRED_VERSION_xdpyinfo ?= "1.0.2" PREFERRED_VERSION_xdriinfo ?= "1.0.2" PREFERRED_VERSION_xedit ?= "1.0.2" PREFERRED_VERSION_xev ?= "1.0.1" 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" |