diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:56:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:56:35 +0200 |
| commit | f7b6a8b30cedaa64ba18d80f1fb3404274281639 (patch) | |
| tree | 13937ba94eed328bb19b1ccf343cca35446b878b /drivers/media/usb/pwc/pwc-kiara.c | |
| parent | b33fb3cf6f5e039dea4a85a708a2c86f8a323575 (diff) | |
| parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
Merge tag 'v5.2-rc3' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/usb/pwc/pwc-kiara.c')
| -rw-r--r-- | drivers/media/usb/pwc/pwc-kiara.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/media/usb/pwc/pwc-kiara.c b/drivers/media/usb/pwc/pwc-kiara.c index e5f4fd8171259..00eee75ebf01a 100644 --- a/drivers/media/usb/pwc/pwc-kiara.c +++ b/drivers/media/usb/pwc/pwc-kiara.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* Linux driver for Philips webcam (C) 2004-2006 Luc Saillard (luc@saillard.org) @@ -7,19 +8,6 @@ The decompression routines have been implemented by reverse-engineering the Nemosoft binary pwcx module. Caveat emptor. - 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 */ |