summaryrefslogtreecommitdiff
path: root/conf/machine/spitz.conf
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-01-14 20:39:47 +0100
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-01-14 20:39:47 +0100
commit3fd04f71ad25d5df59c636986f741b9a36ce6501 (patch)
tree995f4a15764d4196a92ecd966150e38d910d57d1 /conf/machine/spitz.conf
parentb5b3d83a6f3b1c04a4ebe09f636683ef22495d09 (diff)
parente426517ed76c7532434f0687f88fca1295530000 (diff)
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts: recipes/linux/linux-kirkwood_2.6.33-rc1.bb
Diffstat (limited to 'conf/machine/spitz.conf')
-rw-r--r--conf/machine/spitz.conf4
1 files changed, 0 insertions, 4 deletions
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 0d79977180..4fe62b5f43 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -27,7 +27,3 @@ MACHINE_DISPLAY_PPI = "216"
UBOOT_MACHINE = "akita_config"
UBOOT_ENTRYPOINT = "0xA1000000"
UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
-
-XSERVER = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"