diff options
author | Joerg Roedel <jroedel@suse.de> | 2019-06-24 10:23:16 +0200 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2019-06-24 10:23:16 +0200 |
commit | ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5 (patch) | |
tree | e19c18292231202e9cd8d484ee43f46b2c9c9ad1 /drivers/media/pci/cx18/cx18-audio.c | |
parent | iommu/dma: Fix condition check in iommu_dma_unmap_sg (diff) | |
parent | Linux 5.2-rc6 (diff) | |
download | linux-ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5.tar.xz linux-ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5.zip |
Merge tag 'v5.2-rc6' into generic-dma-ops
Linux 5.2-rc6
Diffstat (limited to 'drivers/media/pci/cx18/cx18-audio.c')
-rw-r--r-- | drivers/media/pci/cx18/cx18-audio.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/media/pci/cx18/cx18-audio.c b/drivers/media/pci/cx18/cx18-audio.c index 61fc485d3d80..8602d088601b 100644 --- a/drivers/media/pci/cx18/cx18-audio.c +++ b/drivers/media/pci/cx18/cx18-audio.c @@ -1,19 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * cx18 audio-related functions * * Derived from ivtv-audio.c * * Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl> - * - * 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. */ #include "cx18-driver.h" |