summaryrefslogtreecommitdiff
path: root/recipes/xorg-xserver
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2009-11-06 10:15:27 +0100
committerStefan Schmidt <stefan@datenfreihafen.org>2009-11-06 10:15:27 +0100
commit44b9190fb62a6a09276c765685cc8ddde9cb201f (patch)
treeac61baa4cf259e02de0ce8f1c7b76b3713f2e257 /recipes/xorg-xserver
parentc994c0a4526e8d7a16fecaceffde4f42ed1f45ff (diff)
parent35cc93da885ac6d438da6aaed9517e91d4a7e6b3 (diff)
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/xorg-xserver')
-rw-r--r--recipes/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf3
-rw-r--r--recipes/xorg-xserver/xserver-xorg-conf_0.1.bb2
2 files changed, 3 insertions, 2 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf
index 446ac9777f..56425abf81 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf
@@ -9,7 +9,8 @@ EndSection
Section "Device"
Identifier "Builtin Default fbdev Device 0"
- Driver "omapfb"
+ Driver "fbdev"
+ Option "ShadowFB" "false"
EndSection
Section "Screen"
diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
index ceaf199932..7a8e6e96c5 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Machine specific xorg.conf files"
-PR = "r14"
+PR = "r15"
SRC_URI = "file://xorg.conf"