summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJinkun Jang <jinkun.jang@samsung.com>2013-03-16 01:03:34 +0900
committerBoram Park <boram1288.park@samsung.com>2013-09-02 17:02:55 +0900
commit490708e8c360a3ff72251159769190f829e411c1 (patch)
tree15efa0bf9533779b9ed0a27e87620b16c0eb2f98
parent4ca1dc02bb69c83d45435e9795740eec2ed6262e (diff)
downloadxf86-input-evdevmultitouch-490708e8c360a3ff72251159769190f829e411c1.tar.gz
xf86-input-evdevmultitouch-490708e8c360a3ff72251159769190f829e411c1.tar.bz2
xf86-input-evdevmultitouch-490708e8c360a3ff72251159769190f829e411c1.zip
merge with master
Change-Id: I02eb2cfa085bbfa0ca2f74467021d67f05601c6a
-rw-r--r--packaging/xorg-x11-drv-evdev-multitouch.spec2
-rwxr-xr-xsrc/evdevmultitouch.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/xorg-x11-drv-evdev-multitouch.spec b/packaging/xorg-x11-drv-evdev-multitouch.spec
index 5a99f83..e59313a 100644
--- a/packaging/xorg-x11-drv-evdev-multitouch.spec
+++ b/packaging/xorg-x11-drv-evdev-multitouch.spec
@@ -2,7 +2,7 @@
Name: xorg-x11-drv-evdev-multitouch
Summary: X.Org evdev multitouch input driver.
Version: 2.3.2
-Release: 2
+Release: 4
Group: TO_BE/FILLED_IN
License: TO BE FILLED IN
Source0: %{name}-%{version}.tar.gz
diff --git a/src/evdevmultitouch.c b/src/evdevmultitouch.c
index a43bcd3..0a63ada 100755
--- a/src/evdevmultitouch.c
+++ b/src/evdevmultitouch.c
@@ -203,7 +203,7 @@ static InputInfoPtr pCreatorInfo = NULL;
/* All devices the evdevmultitouch driver has allocated and knows about.
* MAXDEVICES is safe as null-terminated array, as two devices (VCP and VCK)
* cannot be used by evdevmultitouch, leaving us with a space of 2 at the end. */
-static EvdevMultitouchPtr evdevmultitouch_devices[MAXDEVICES] = {NULL};
+static EvdevMultitouchPtr evdevmultitouch_devices[MAXDEVICES] = {NULL,};
static size_t EvdevMultitouchCountBits(unsigned long *array, size_t nlongs)
{