diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2019-06-14 23:18:53 +0300 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2019-06-14 23:18:53 +0300 |
| commit | 8afecfb0ec961e37e61b2d19c4fa71617a9482de (patch) | |
| tree | c43ea51a47b1e76b762caa4c1b0c356249e5e874 /sound/pci/cs5535audio/cs5535audio_olpc.c | |
| parent | ce1a5ea18ef9bf4c62c75abe7c540a29264ec988 (diff) | |
| parent | d1fdb6d8f6a4109a4263176c84b899076a5f8008 (diff) | |
| download | linux-8afecfb0ec961e37e61b2d19c4fa71617a9482de.tar.xz | |
Merge tag 'v5.2-rc4' into mauro
We need to pick up post-rc1 changes to various document files so they don't
get lost in Mauro's massive RST conversion push.
Diffstat (limited to 'sound/pci/cs5535audio/cs5535audio_olpc.c')
| -rw-r--r-- | sound/pci/cs5535audio/cs5535audio_olpc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/pci/cs5535audio/cs5535audio_olpc.c b/sound/pci/cs5535audio/cs5535audio_olpc.c index 3b0fdaca8dc7..bd246b10636e 100644 --- a/sound/pci/cs5535audio/cs5535audio_olpc.c +++ b/sound/pci/cs5535audio/cs5535audio_olpc.c @@ -1,13 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * OLPC XO-1 additional sound features * * Copyright © 2006 Jaya Kumar <jayakumar.lkml@gmail.com> * Copyright © 2007-2008 Andres Salomon <dilinger@debian.org> - * - * 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 <sound/core.h> #include <sound/info.h> |