summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-09-19 00:48:11 +0100
committerTom Zanussi <tom.zanussi@intel.com>2013-09-20 18:31:27 -0500
commit08c968595158a047f410a996ebfdfb834b631eda (patch)
treeff4a8cb2a234584720dd75199ce720d7b82dbcf7
parentf9ae3571eae62516fe6f9d62efd212efd9cd217d (diff)
downloadmeta-intel-08c968595158a047f410a996ebfdfb834b631eda.tar.gz
crownbay: 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-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay-noemgd/xorg.conf26
-rw-r--r--meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf5
2 files changed, 0 insertions, 31 deletions
diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay-noemgd/xorg.conf b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay-noemgd/xorg.conf
deleted file mode 100644
index da4fc3c6..00000000
--- a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay-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-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf
index 662f60f3..52179631 100644
--- a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf
+++ b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/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