diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 08:27:16 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 08:27:16 +0300 |
commit | 23004ec330925e6834c8ddac00e3dd12eb5fb345 (patch) | |
tree | 6bcbf18d8a2429e16f842b8a357f439f4f8d3926 /drivers/input/misc/ad714x-spi.c | |
parent | 4c1d2fc7d56cf87a0d399be69e08d5aef73802eb (diff) | |
parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
download | linux-23004ec330925e6834c8ddac00e3dd12eb5fb345.tar.xz |
Merge 5.2-rc3 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input/misc/ad714x-spi.c')
-rw-r--r-- | drivers/input/misc/ad714x-spi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/misc/ad714x-spi.c b/drivers/input/misc/ad714x-spi.c index aac910326447..7d3bf434620f 100644 --- a/drivers/input/misc/ad714x-spi.c +++ b/drivers/input/misc/ad714x-spi.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * AD714X CapTouch Programmable Controller driver (SPI bus) * * Copyright 2009-2011 Analog Devices Inc. - * - * Licensed under the GPL-2 or later. */ #include <linux/input.h> /* BUS_SPI */ |