aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-07-30 16:35:36 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2011-07-30 16:41:50 +0100
commitfe7a6762f3f2cb571186318bf21154344bd0650e (patch)
treec9664f07bb487b8b32f9faac4ae99365fed67fd9 /conf
parent816ff1e675a6903deb903c8e2c4caed423aeeac9 (diff)
downloadmeta-handheld-fe7a6762f3f2cb571186318bf21154344bd0650e.tar.gz
zaurus.inc: switch over to xserver-xorg by default
Integrate change from meta-smartphone to use xserver-xorg for all Zaurus machines. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/zaurus.inc25
1 files changed, 4 insertions, 21 deletions
diff --git a/conf/machine/include/zaurus.inc b/conf/machine/include/zaurus.inc
index e8518fa..6ff1470 100644
--- a/conf/machine/include/zaurus.inc
+++ b/conf/machine/include/zaurus.inc
@@ -30,29 +30,12 @@ IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
"
#########
-# xserver (FIXME: xserver-xorg is in testing on spitz)
+# xserver
#########
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-XSERVER = "xserver-kdrive-fbdev"
-
-# c7x0 uses kdrive-imageon_1.2.0
-PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon"
-XSERVER_c7x0 = "xserver-kdrive-imageon"
-
-# collie uses kdrive-fbdev
-PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive"
-XSERVER_collie = "xserver-kdrive-fbdev"
-
-# FIXME xserver-kdrive 1.3.0.0 is still the only working version ?
-PREFERRED_PROVIDER_virtual/xserver_akita = "xserver-kdrive-1300"
-XSERVER_akita = "xserver-kdrive-1300-fbdev"
-
-# spitz uses xserver-xorg
-PREFERRED_PROVIDER_virtual/xserver_spitz = "xserver-xorg"
-XSERVER_spitz = "xserver-xorg xf86-video-fbdev xf86-input-keyboard xf86-input-mouse xf86-input-evdev"
-PREFERRED_PROVIDER_virtual/libgl_spitz = "mesa-dri"
-
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg xf86-video-fbdev xf86-input-keyboard xf86-input-mouse xf86-input-evdev"
+PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
########
# kernel