[oe-commits] org.oe.dev xserver-kdrive-common_openmoko: fix (cosmetic) merge damage in Xserver script

[mickeyl commit]

xserver-kdrive-common_openmoko: fix (cosmetic) merge damage in Xserver script

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 5e37b755f10936f81113606e76957fb837b04eda
ViewMTN: http://monotone.openembedded.org/revision/info/5e37b755f10936f81113606e76957fb837b04eda
Files:
1
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
Diffs:

#
# mt diff -rd1cdb61789b6a035fdaff06f37d6490c67bcccc0 -r5e37b755f10936f81113606e76957fb837b04eda
#
# 
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
#  from [7e9b719553b5e77b1e579024abf0be3c694dce4f]
#    to [4475aa19d15d8d38e8e7b1fa831c3c012ef9c190]
# 
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver	7e9b719553b5e77b1e579024abf0be3c694dce4f
+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver	4475aa19d15d8d38e8e7b1fa831c3c012ef9c190
@@ -97,9 +97,8 @@ case `module_id` in
         "Nokia N800")
                 ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;;
         *)
-# It is a device we do not know about, in which case we force
                 # It is a device we do not know about, in which case we force
-# kdrive to use the current framebuffer geometry -- otherwise
+                # kdrive to use the current framebuffer geometry -- otherwise
                 # it will default to trying to achieve 1024x768
                 S=`fallback_screen_arg`
                 ARGS="$ARGS -screen $S" ;;