summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-09-19 00:48:35 +0100
committerTom Zanussi <tom.zanussi@intel.com>2013-09-20 18:32:05 -0500
commitade3cbd98b781f23792ccd80daad10b65089996f (patch)
tree4b39319afa57a2cf51e231884ca72188fdc1ebfe
parentfee90862badcc8dada39ba07ec25489f1e9cc34d (diff)
downloadmeta-intel-ade3cbd98b781f23792ccd80daad10b65089996f.tar.gz
sys940x: enable input device hotplug in xserver-xf86-config
xorg.conf was disabling hotplugged input devices for no known reason, so remove that option. Also remove the setting of DontZap to the default value for clarity. Signed-off-by: Ross Burton <ross.burton@intel.com> Acked-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x-noemgd/xorg.conf26
-rw-r--r--meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x/xorg.conf5
2 files changed, 0 insertions, 31 deletions
diff --git a/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x-noemgd/xorg.conf b/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x-noemgd/xorg.conf
deleted file mode 100644
index da4fc3c6..00000000
--- a/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x-noemgd/xorg.conf
+++ /dev/null
@@ -1,26 +0,0 @@
1Section "Device"
2 Identifier "Generic VESA"
3 Driver "vesa"
4EndSection
5
6Section "Monitor"
7 Identifier "Generic Monitor"
8 Option "DPMS"
9EndSection
10
11Section "Screen"
12 Identifier "Default Screen"
13 Device "Generic VESA"
14 Monitor "Generic Monitor"
15 DefaultDepth 24
16EndSection
17
18Section "ServerLayout"
19 Identifier "Default Layout"
20 Screen "Default Screen"
21EndSection
22
23Section "ServerFlags"
24 Option "DontZap" "0"
25 Option "AutoAddDevices" "False"
26EndSection
diff --git a/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x/xorg.conf b/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x/xorg.conf
index 73736aca..5266117b 100644
--- a/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x/xorg.conf
+++ b/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x/xorg.conf
@@ -41,8 +41,3 @@ Section "ServerLayout"
41 # InputDevice "Keyboard0" "CoreKeyboard" 41 # InputDevice "Keyboard0" "CoreKeyboard"
42 # InputDevice "DevInputMice" "SendCoreEvents" 42 # InputDevice "DevInputMice" "SendCoreEvents"
43EndSection 43EndSection
44
45Section "ServerFlags"
46 Option "DontZap" "0"
47 Option "AutoAddDevices" "False"
48EndSection