aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/xorg-xserver/xserver-xorg-conf
diff options
context:
space:
mode:
authorCliff Brake <cbrake@bec-systems.com>2010-11-12 00:00:20 -0500
committerCliff Brake <cbrake@bec-systems.com>2010-11-12 00:00:20 -0500
commit3c6efe8f8abc16668ca5e9cdf7a46665dac87172 (patch)
tree642c13416b99e80f0871cdc6668e832e635dfb48 /recipes/xorg-xserver/xserver-xorg-conf
parentc400c874f2ac9233b8a43a73309b6e7907289c54 (diff)
parent13fbe7253c95881ede787004a4c3a1c31502e5c6 (diff)
downloadopenembedded-testing.tar.gz
openembedded-testing.tar.bz2
openembedded-testing.zip
Merge branch 'master' into testing-nexttested_2010-11-12testing
Diffstat (limited to 'recipes/xorg-xserver/xserver-xorg-conf')
-rw-r--r--recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf7
-rw-r--r--recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf4
2 files changed, 9 insertions, 2 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf
index 83eaa0cb2e..5e123ae22e 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf
@@ -32,11 +32,14 @@ EndSection
Section "InputDevice"
Identifier "Touchscreen"
- Driver "evdev"
+ Driver "tslib"
Option "Device" "/dev/input/event1"
- Option "SwapAxes" "True"
+ Option "EmulateRightButton" "True"
EndSection
+Section "ServerFlags"
+ Option "AutoAddDevices" "False"
+EndSection
Section "ServerLayout"
Identifier "Default Layout"
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf
index 673c7d052c..b27d5ccb6d 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf
@@ -40,8 +40,12 @@ Section "InputDevice"
Identifier "Touchscreen"
Driver "tslib"
Option "Device" "/dev/input/event1"
+ Option "EmulateRightButton" "True"
EndSection
+Section "ServerFlags"
+ Option "AutoAddDevices" "False"
+EndSection
Section "ServerLayout"
Identifier "Default Layout"