From: Jeff Dike <jdike@x86_64.user-mode-linux.org>
Date: Fri, 30 Jul 2010 04:07:56 +0000 (-0400)
Subject: xserver-xf86-config: netbook - merge the two ServerFlags sections
X-Git-Tag: 2011-1~5027
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=e4d743e0da3430f3e3099d2b28160de96948c2c6;p=openembedded-core.git

xserver-xf86-config: netbook - merge the two ServerFlags sections

A previous commit added AutoAddDevices as a separate ServerFlags
section. This is apparently overridden by the one at the end of the
file, so they need to be merged.

[BUGID #141]

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
---

diff --git a/meta/packages/xorg-xserver/xserver-xf86-config/netbook/xorg.conf b/meta/packages/xorg-xserver/xserver-xf86-config/netbook/xorg.conf
index 897a1d6fef..e18b911199 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-config/netbook/xorg.conf
+++ b/meta/packages/xorg-xserver/xserver-xf86-config/netbook/xorg.conf
@@ -1,7 +1,3 @@
-Section "ServerFlags"
-    Option "AutoAddDevices" "False"
-EndSection
-
 Section "Device"
     Identifier    "Intel Graphics Driver"
     Driver        "intel"
@@ -26,4 +22,5 @@ EndSection
 
 Section "ServerFlags"
     Option        "DontZap"  "0"
+    Option	  "AutoAddDevices" "False"
 EndSection