From e4d743e0da3430f3e3099d2b28160de96948c2c6 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Fri, 30 Jul 2010 00:07:56 -0400 Subject: [PATCH] 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 --- .../xorg-xserver/xserver-xf86-config/netbook/xorg.conf | 5 +---- 1 file changed, 1 insertion(+), 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 @@ -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