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 897a1d6fefa7704d6076693466ef5da33efa3710..e18b9111991cc15992afd24f7e463dd361bce161 100644 (file)
--- 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