summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorJeff Dike <jdike@x86_64.user-mode-linux.org>2010-07-30 00:07:56 -0400
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-30 14:50:31 +0100
commite4d743e0da3430f3e3099d2b28160de96948c2c6 (patch)
tree1900243c147ad1ebfcdaf60f5391de6718cfe2be /meta/packages
parent71bf22d9dbd4594f7d34c5a53305d92c7485e917 (diff)
downloadpoky-e4d743e0da3430f3e3099d2b28160de96948c2c6.tar.gz
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>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-config/netbook/xorg.conf5
1 files changed, 1 insertions, 4 deletions
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 @@
1Section "ServerFlags"
2 Option "AutoAddDevices" "False"
3EndSection
4
5Section "Device" 1Section "Device"
6 Identifier "Intel Graphics Driver" 2 Identifier "Intel Graphics Driver"
7 Driver "intel" 3 Driver "intel"
@@ -26,4 +22,5 @@ EndSection
26 22
27Section "ServerFlags" 23Section "ServerFlags"
28 Option "DontZap" "0" 24 Option "DontZap" "0"
25 Option "AutoAddDevices" "False"
29EndSection 26EndSection