diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 07:27:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 07:27:16 +0200 |
| commit | 23004ec330925e6834c8ddac00e3dd12eb5fb345 (patch) | |
| tree | 6bcbf18d8a2429e16f842b8a357f439f4f8d3926 /drivers/iio/frequency | |
| parent | 4c1d2fc7d56cf87a0d399be69e08d5aef73802eb (diff) | |
| parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
| download | blackbird-op-linux-23004ec330925e6834c8ddac00e3dd12eb5fb345.tar.gz blackbird-op-linux-23004ec330925e6834c8ddac00e3dd12eb5fb345.zip | |
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/iio/frequency')
| -rw-r--r-- | drivers/iio/frequency/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/iio/frequency/Makefile | 1 | ||||
| -rw-r--r-- | drivers/iio/frequency/ad9523.c | 3 | ||||
| -rw-r--r-- | drivers/iio/frequency/adf4350.c | 3 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/iio/frequency/Kconfig b/drivers/iio/frequency/Kconfig index dc5e0b72882f..c86db8b42380 100644 --- a/drivers/iio/frequency/Kconfig +++ b/drivers/iio/frequency/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Frequency # Direct Digital Synthesis drivers (DDS) diff --git a/drivers/iio/frequency/Makefile b/drivers/iio/frequency/Makefile index 2bca03f3e2e3..f2e396d40ddd 100644 --- a/drivers/iio/frequency/Makefile +++ b/drivers/iio/frequency/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Makefile iio/frequency # diff --git a/drivers/iio/frequency/ad9523.c b/drivers/iio/frequency/ad9523.c index ceb1daceeb46..a7322184cbdd 100644 --- a/drivers/iio/frequency/ad9523.c +++ b/drivers/iio/frequency/ad9523.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * AD9523 SPI Low Jitter Clock Generator * * Copyright 2012 Analog Devices Inc. - * - * Licensed under the GPL-2. */ #include <linux/device.h> diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c index f4748ff243f7..ae0ca09ae062 100644 --- a/drivers/iio/frequency/adf4350.c +++ b/drivers/iio/frequency/adf4350.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * ADF4350/ADF4351 SPI Wideband Synthesizer driver * * Copyright 2012-2013 Analog Devices Inc. - * - * Licensed under the GPL-2. */ #include <linux/device.h> |
