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 /sound/soc/codecs/lm4857.c | |
parent | staging: mt7621-dma: sizeof via pointer dereference (diff) | |
parent | Linux 5.2-rc3 (diff) | |
download | linux-dev-23004ec330925e6834c8ddac00e3dd12eb5fb345.tar.xz linux-dev-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 'sound/soc/codecs/lm4857.c')
-rw-r--r-- | sound/soc/codecs/lm4857.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/codecs/lm4857.c b/sound/soc/codecs/lm4857.c index 1e964079642a..300b325e2fdd 100644 --- a/sound/soc/codecs/lm4857.c +++ b/sound/soc/codecs/lm4857.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * LM4857 AMP driver * @@ -5,12 +6,6 @@ * Author: Graeme Gregory * graeme.gregory@wolfsonmicro.com * Copyright 2011 Lars-Peter Clausen <lars@metafoo.de> - * - * 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/init.h> |