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>

diff --git a/recipes/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/palmpre/xorg.conf
index 6915b87..b155f6a 100644 (file)
--- 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 9db7962..692df9d 100644 (file)
--- 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"