xserver-kdrive-common: merge n800 support from poky

diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
index e82a497..66feaad 100644 (file)
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
@@ -87,7 +87,7 @@ case `module_id` in
         "Cellon C8000 Board")                                                                                                                                                
                 ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;;                                                                                                                
         "HTC Universal")                                                                                                                                                     
-                ARGS="$ARGS -dpi 100 -screen 480x640@270" ;;                                                                                
+                ARGS="$ARGS -dpi 225 -screen 480x640@270" ;;                                                                                
        "ARM-IntegratorCP" | "ARM-Versatile PB")
                ARGS="$ARGS -rgba vrgb" ;;
        "Compulab CM-x270")
@@ -96,7 +96,9 @@ case `module_id` in
                 ;;
         "GTA01")
                 ARGS="$ARGS -dpi 285 -screen 480x640" ;;
-        *)
+        Nokia N800")
+               ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;;
+       *)
                # Its a device we dont know about - in which case force
                 # kdrive to use the current framebuffer geometry otherwise
                # it will defualt to trying to achieve 1024x768 

diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 633c287..108f0c6 100644 (file)
--- a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}