diff options
author | Mark Brown <broonie@kernel.org> | 2019-06-18 20:12:47 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-06-18 20:12:47 +0200 |
commit | e1d700f7c94e755106749411706a38e39a93404b (patch) | |
tree | b1230cb7eba5a4ef28ed2cd2527d9ac78f06cc00 /sound/isa/msnd/msnd_pinnacle_mixer.c | |
parent | regulator: qcom_spmi: Refactor get_mode/set_mode (diff) | |
parent | Linux 5.2-rc4 (diff) | |
download | linux-e1d700f7c94e755106749411706a38e39a93404b.tar.xz linux-e1d700f7c94e755106749411706a38e39a93404b.zip |
Merge tag 'v5.2-rc4' into regulator-5.3
Linux 5.2-rc4
Diffstat (limited to 'sound/isa/msnd/msnd_pinnacle_mixer.c')
-rw-r--r-- | sound/isa/msnd/msnd_pinnacle_mixer.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/isa/msnd/msnd_pinnacle_mixer.c b/sound/isa/msnd/msnd_pinnacle_mixer.c index b408540798c1..d0770e2aedca 100644 --- a/sound/isa/msnd/msnd_pinnacle_mixer.c +++ b/sound/isa/msnd/msnd_pinnacle_mixer.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /*************************************************************************** msnd_pinnacle_mixer.c - description ------------------- @@ -8,10 +9,6 @@ /*************************************************************************** * * - * 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. * * * ***************************************************************************/ |