summaryrefslogtreecommitdiffstats
path: root/meta/packages/x11-common/x11-common/etc/X11/Xserver
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/x11-common/x11-common/etc/X11/Xserver')
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xserver8
1 files changed, 2 insertions, 6 deletions
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xserver b/meta/packages/x11-common/x11-common/etc/X11/Xserver
index 9a0986ad61..3d4aa74b95 100644
--- a/meta/packages/x11-common/x11-common/etc/X11/Xserver
+++ b/meta/packages/x11-common/x11-common/etc/X11/Xserver
@@ -30,12 +30,9 @@ ARGS=" -br -pn"
30 30
31if [ "$XSERVER" != "/usr/bin/Xorg" ]; then 31if [ "$XSERVER" != "/usr/bin/Xorg" ]; then
32 32
33 . /etc/formfactor/config 33 . /etc/formfactor/config
34 34
35 # use ucb 1x00 touchscreen if present 35 ARGS="$ARGS -keybd keyboard"
36 if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
37 ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
38 fi
39 36
40 # use usb mouse if present 37 # use usb mouse if present
41 if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ]; then 38 if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ]; then
@@ -78,4 +75,3 @@ fi
78DISPLAY=':0' 75DISPLAY=':0'
79 76
80exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* 77exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
81