From 0c53cbcff68f7a466da5bb59a1cbf655254373d7 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Fri, 13 May 2011 12:41:55 +0200
Subject: [PATCH] xorg-server: prefer /etc/X11/xorg.conf over
 /etc/X11/xorg-$DRIVER.conf

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/xserver/xorg-server/scripts/xorg_start | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/x11/xserver/xorg-server/scripts/xorg_start b/packages/x11/xserver/xorg-server/scripts/xorg_start
index dd813e45ca..cb011c4e1f 100755
--- a/packages/x11/xserver/xorg-server/scripts/xorg_start
+++ b/packages/x11/xserver/xorg-server/scripts/xorg_start
@@ -32,9 +32,9 @@ if [ "$RUNLEVEL" = openelec ]; then
 
   logger -t Xorg "### setup xorg.conf paths ###"
 
+  XORG_CONF_USER="/storage/.config/xorg.conf"
   XORG_CONF_DEFAULT="/etc/X11/xorg.conf"
   XORG_CONF_DRIVER="/etc/X11/xorg-${xorg_driver}.conf"
-  XORG_CONF_USER="/storage/.config/xorg.conf"
 
   ##############################################################################
   # creating start options
@@ -51,10 +51,10 @@ if [ "$RUNLEVEL" = openelec ]; then
   # load user defined xorg.conf, if exist
   if [ -f "$XORG_CONF_USER" ]; then
     XORG_ARGS="$XORG_ARGS -config $XORG_CONF_USER"
-  elif [ -f "$XORG_CONF_DRIVER" ]; then
-    XORG_ARGS="$XORG_ARGS -config $XORG_CONF_DRIVER"
   elif [ -f "$XORG_CONF_DEFAULT" ]; then
     XORG_ARGS="$XORG_ARGS -config $XORG_CONF_DEFAULT"
+  elif [ -f "$XORG_CONF_DRIVER" ]; then
+    XORG_ARGS="$XORG_ARGS -config $XORG_CONF_DRIVER"
   fi
 
   ##############################################################################