diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:50:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:50:18 +0200 |
| commit | 26b73da3604cc1a6596406d136b14d1a01c3676f (patch) | |
| tree | c7839809e35fce4868910742157e8ef96782b378 /sound/pci/trident/trident.h | |
| parent | futex: Consolidate duplicated timer setup code (diff) | |
| parent | Linux 5.2-rc3 (diff) | |
| download | linux-26b73da3604cc1a6596406d136b14d1a01c3676f.tar.xz linux-26b73da3604cc1a6596406d136b14d1a01c3676f.zip | |
Merge tag 'v5.2-rc3' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'sound/pci/trident/trident.h')
| -rw-r--r-- | sound/pci/trident/trident.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sound/pci/trident/trident.h b/sound/pci/trident/trident.h index 2d62c1921255..c7567edbe4c4 100644 --- a/sound/pci/trident/trident.h +++ b/sound/pci/trident/trident.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __SOUND_TRIDENT_H #define __SOUND_TRIDENT_H @@ -5,22 +6,6 @@ * audio@tridentmicro.com * Fri Feb 19 15:55:28 MST 1999 * Definitions for Trident 4DWave DX/NX chips - * - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ #include <sound/pcm.h> |