diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-09 09:11:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-09 09:11:21 +0200 |
| commit | 0154ec71d597692a0d0682b19eac4b3adfb7f3dc (patch) | |
| tree | 121b4ac35146f5696da090d3ae2534c76523e6c2 /include/sound/max98090.h | |
| parent | VMCI: Fixup atomic64_t abuse (diff) | |
| parent | Linux 5.2-rc4 (diff) | |
| download | linux-dev-0154ec71d597692a0d0682b19eac4b3adfb7f3dc.tar.xz linux-dev-0154ec71d597692a0d0682b19eac4b3adfb7f3dc.zip | |
Merge 5.2-rc4 into char-misc-next
We want the char/misc driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/sound/max98090.h')
| -rw-r--r-- | include/sound/max98090.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/sound/max98090.h b/include/sound/max98090.h index 95efb13f8478..6bc1b014f59a 100644 --- a/include/sound/max98090.h +++ b/include/sound/max98090.h @@ -1,13 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Platform data for MAX98090 * * Copyright 2011-2012 Maxim Integrated Products - * - * 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. - * */ #ifndef __SOUND_MAX98090_PDATA_H__ |