aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik 'playya' Sdun <frederik.sdun@googlemail.com>2011-02-24 15:05:49 +0100
committerSimon Busch <morphis@gravedo.de>2011-03-06 18:15:32 +0100
commit08067691d9771f17869643b5c5e76d1ab708b3ab (patch)
tree2c1a676eacf488c2419d66a35cf4e48a36ef135a
parent07b6f31f81defb6a9a58d6ae1ef4642e70225c55 (diff)
downloadopenembedded-08067691d9771f17869643b5c5e76d1ab708b3ab.tar.gz
xserver-xorg-conf: update palmpre xorg.conf and bump PR
Signed-off-by: Frederik 'playya' Sdun <Frederik.Sdun@googlemail.com> Acked-by: Simon Busch <morphis@gravedo.de>
-rw-r--r--recipes/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf11
-rw-r--r--recipes/xorg-xserver/xserver-xorg-conf_0.1.bb2
2 files changed, 8 insertions, 5 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf
index 6915b87b96..b155f6a62b 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf
@@ -27,6 +27,7 @@ Section "ServerLayout"
Identifier "Builtin Default Layout"
Screen "Builtin Default fbdev Screen 0"
InputDevice "Touchscreen" "CorePointer"
+ InputDevice "Keyboard" "CoreKeyboard"
EndSection
Section "InputDevice"
@@ -43,12 +44,14 @@ EndSection
Section "InputDevice"
Identifier "Keyboard"
- Driver "palm-pre"
+ Driver "evdev"
Option "Device" "/dev/input/event2"
- Option "SendCoreEvents" "true"
- #Option "XkbModel" "palm-pre"
- Option "XkbLayout" "palm-pre"
+ #Option "SendCoreEvents" "true"
+ Option "XkbRules" "palmpre"
+ Option "XkbModel" "palmpre"
+ Option "XkbLayout" "palmpre"
# Option "XKbOptions" ""
+ Option "CoreKeyboard" "true"
EndSection
#Section "InputDevice"
diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
index 9db79622c5..692df9d5b4 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 = "r42"
+PR = "r43"
SRC_URI = "file://xorg.conf"