diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:29:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:29:16 +0200 |
| commit | bddb3636737f658886a0a02b64db5366bba3428e (patch) | |
| tree | 8f7ffcb42803fa0bb3378ef969545e4a5e57262c /drivers/iio/adc/meson_saradc.c | |
| parent | 3384c78631dd722c2cdc5c57fbdd39fc1b5a9f2d (diff) | |
| parent | cbb99c0f588737ec98c333558922ce47e9a95827 (diff) | |
Merge branch 'x86/cpu' into perf/core, to pick up dependent changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/iio/adc/meson_saradc.c')
| -rw-r--r-- | drivers/iio/adc/meson_saradc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index 510d8b7ef3a0..70bbcf253cb6 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -1,14 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Amlogic Meson Successive Approximation Register (SAR) A/D Converter * * Copyright (C) 2017 Martin Blumenstingl <martin.blumenstingl@googlemail.com> - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <linux/bitfield.h> |