diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-06-07 11:00:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-07 11:00:14 -0700 |
| commit | a6cdeeb16bff89c8486324f53577db058cbe81ba (patch) | |
| tree | de2d38e10f5768bdf1d2902112a4803d0ae767f3 /drivers/input/touchscreen/stmpe-ts.c | |
| parent | Merge branch 'Xilinx-axienet-driver-updates' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-a6cdeeb16bff89c8486324f53577db058cbe81ba.tar.xz linux-dev-a6cdeeb16bff89c8486324f53577db058cbe81ba.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Some ISDN files that got removed in net-next had some changes
done in mainline, take the removals.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/input/touchscreen/stmpe-ts.c')
| -rw-r--r-- | drivers/input/touchscreen/stmpe-ts.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/input/touchscreen/stmpe-ts.c b/drivers/input/touchscreen/stmpe-ts.c index cf9c9aa39f6e..7e16fcfe3b95 100644 --- a/drivers/input/touchscreen/stmpe-ts.c +++ b/drivers/input/touchscreen/stmpe-ts.c @@ -1,14 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * STMicroelectronics STMPE811 Touchscreen Driver * * (C) 2010 Luotao Fu <l.fu@pengutronix.de> * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * */ #include <linux/kernel.h> |