aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/exc3000.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2019-07-15 09:42:32 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-07-15 09:42:32 -0700
commitecb41832bd2a7a3f8ac93527cec5e51e3827daed (patch)
treea382a3719eca9ac8a22ae7f1715d0bd4843dc8e2 /drivers/input/touchscreen/exc3000.c
parentInput: synaptics - fix misuse of strlcpy (diff)
parentLinux 5.2 (diff)
downloadlinux-dev-ecb41832bd2a7a3f8ac93527cec5e51e3827daed.tar.xz
linux-dev-ecb41832bd2a7a3f8ac93527cec5e51e3827daed.zip
Merge tag 'v5.2' into next
Sync up with mainline to resolve conflicts in iforce driver.
Diffstat (limited to 'drivers/input/touchscreen/exc3000.c')
-rw-r--r--drivers/input/touchscreen/exc3000.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/exc3000.c b/drivers/input/touchscreen/exc3000.c
index 37437a53cd1a..e007e2e8f626 100644
--- a/drivers/input/touchscreen/exc3000.c
+++ b/drivers/input/touchscreen/exc3000.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Driver for I2C connected EETI EXC3000 multiple touch controller
*
* Copyright (C) 2017 Ahmet Inan <inan@distec.de>
*
* minimal implementation based on egalax_ts.c and egalax_i2c.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
*/
#include <linux/bitops.h>