diff options
author | Mark Brown <broonie@kernel.org> | 2019-06-26 13:39:34 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-06-26 13:39:34 +0200 |
commit | 53c8b29abe42e5601cfa0ea5962532f0cfdec8a0 (patch) | |
tree | cad53f42ce7a03c39a984bcdbcc42cd47f1af6f9 /sound/soc/atmel/atmel-pdmic.c | |
parent | ASoC: soc-core: don't use soc_find_component() at snd_soc_find_dai() (diff) | |
parent | Linux 5.2-rc6 (diff) | |
download | linux-53c8b29abe42e5601cfa0ea5962532f0cfdec8a0.tar.xz linux-53c8b29abe42e5601cfa0ea5962532f0cfdec8a0.zip |
Merge tag 'v5.2-rc6' into asoc-5.3
Linux 5.2-rc6
Diffstat (limited to 'sound/soc/atmel/atmel-pdmic.c')
-rw-r--r-- | sound/soc/atmel/atmel-pdmic.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/atmel/atmel-pdmic.c b/sound/soc/atmel/atmel-pdmic.c index 088dd9ff1bcb..d46741003fa8 100644 --- a/sound/soc/atmel/atmel-pdmic.c +++ b/sound/soc/atmel/atmel-pdmic.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* Atmel PDMIC driver * * Copyright (C) 2015 Atmel * * Author: Songjun Wu <songjun.wu@atmel.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 or later - * as published by the Free Software Foundation. */ #include <linux/of.h> |