diff options
author | Ross Burton <ross.burton@intel.com> | 2013-09-19 00:48:24 +0100 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2013-09-20 18:31:54 -0500 |
commit | fee90862badcc8dada39ba07ec25489f1e9cc34d (patch) | |
tree | caca6fcabcedb360420faf7e748fda3e39bc27d0 | |
parent | 363a5f2c2e391ccd63ae103dcb5b03ce7ead76c6 (diff) | |
download | meta-intel-fee90862badcc8dada39ba07ec25489f1e9cc34d.tar.gz |
fri2: 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-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf | 26 | ||||
-rw-r--r-- | meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf | 5 |
2 files changed, 0 insertions, 31 deletions
diff --git a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf deleted file mode 100644 index bda3535a..00000000 --- a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Section "Device" | ||
2 | Identifier "Generic VESA" | ||
3 | Driver "fbdev" | ||
4 | EndSection | ||
5 | |||
6 | Section "Monitor" | ||
7 | Identifier "Generic Monitor" | ||
8 | Option "DPMS" | ||
9 | EndSection | ||
10 | |||
11 | Section "Screen" | ||
12 | Identifier "Default Screen" | ||
13 | Device "Generic VESA" | ||
14 | Monitor "Generic Monitor" | ||
15 | DefaultDepth 24 | ||
16 | EndSection | ||
17 | |||
18 | Section "ServerLayout" | ||
19 | Identifier "Default Layout" | ||
20 | Screen "Default Screen" | ||
21 | EndSection | ||
22 | |||
23 | Section "ServerFlags" | ||
24 | Option "DontZap" "0" | ||
25 | Option "AutoAddDevices" "False" | ||
26 | EndSection | ||
diff --git a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf index 8c315658..a9211e78 100644 --- a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf +++ b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf | |||
@@ -58,8 +58,3 @@ Section "ServerLayout" | |||
58 | # InputDevice "Keyboard0" "CoreKeyboard" | 58 | # InputDevice "Keyboard0" "CoreKeyboard" |
59 | # InputDevice "DevInputMice" "SendCoreEvents" | 59 | # InputDevice "DevInputMice" "SendCoreEvents" |
60 | EndSection | 60 | EndSection |
61 | |||
62 | Section "ServerFlags" | ||
63 | Option "DontZap" "0" | ||
64 | Option "AutoAddDevices" "False" | ||
65 | EndSection | ||