From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 16 Oct 2007 19:10:42 +0000 (+0000)
Subject: xserver-kdrive-common_openmoko: fix (cosmetic) merge damage in Xserver script
X-Git-Tag: Release-2010-05/1~8549^2~1^2~33^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18c19924d9f122019aa6380903a54645c2e50570;p=openembedded.git

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

diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
index 50da711ed4..f7fe52d84e 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
@@ -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" ;;