Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

headers: Remove some left-over license text in include/uapi/linux/v4l2-*

Remove some left-over from commit e2be04c7f995 ("License cleanup: add SPDX
license identifier to uapi header files with a license")

When the SPDX-License-Identifier tag has been added, the corresponding
license text has not been removed.

Remove it now.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

authored by

Christophe JAILLET and committed by
Hans Verkuil
96c1212a 8478afa8

-103
-39
include/uapi/linux/v4l2-common.h
··· 10 10 * 11 11 * Copyright (C) 2012 Nokia Corporation 12 12 * Contact: Sakari Ailus <sakari.ailus@iki.fi> 13 - * 14 - * This program is free software; you can redistribute it and/or modify 15 - * it under the terms of the GNU General Public License as published by 16 - * the Free Software Foundation; either version 2 of the License, or 17 - * (at your option) any later version. 18 - * 19 - * This program is distributed in the hope that it will be useful, 20 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 21 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 22 - * GNU General Public License for more details. 23 - * 24 - * Alternatively you can redistribute this file under the terms of the 25 - * BSD license as stated below: 26 - * 27 - * Redistribution and use in source and binary forms, with or without 28 - * modification, are permitted provided that the following conditions 29 - * are met: 30 - * 1. Redistributions of source code must retain the above copyright 31 - * notice, this list of conditions and the following disclaimer. 32 - * 2. Redistributions in binary form must reproduce the above copyright 33 - * notice, this list of conditions and the following disclaimer in 34 - * the documentation and/or other materials provided with the 35 - * distribution. 36 - * 3. The names of its contributors may not be used to endorse or promote 37 - * products derived from this software without specific prior written 38 - * permission. 39 - * 40 - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 41 - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 42 - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 43 - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 44 - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 45 - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 46 - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 47 - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 48 - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 49 - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 50 - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 51 - * 52 13 */ 53 14 54 15 #ifndef __V4L2_COMMON__
-38
include/uapi/linux/v4l2-controls.h
··· 4 4 * 5 5 * Copyright (C) 1999-2012 the contributors 6 6 * 7 - * This program is free software; you can redistribute it and/or modify 8 - * it under the terms of the GNU General Public License as published by 9 - * the Free Software Foundation; either version 2 of the License, or 10 - * (at your option) any later version. 11 - * 12 - * This program is distributed in the hope that it will be useful, 13 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 - * GNU General Public License for more details. 16 - * 17 - * Alternatively you can redistribute this file under the terms of the 18 - * BSD license as stated below: 19 - * 20 - * Redistribution and use in source and binary forms, with or without 21 - * modification, are permitted provided that the following conditions 22 - * are met: 23 - * 1. Redistributions of source code must retain the above copyright 24 - * notice, this list of conditions and the following disclaimer. 25 - * 2. Redistributions in binary form must reproduce the above copyright 26 - * notice, this list of conditions and the following disclaimer in 27 - * the documentation and/or other materials provided with the 28 - * distribution. 29 - * 3. The names of its contributors may not be used to endorse or promote 30 - * products derived from this software without specific prior written 31 - * permission. 32 - * 33 - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 34 - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 35 - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 36 - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 37 - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 38 - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 39 - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 40 - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 41 - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 42 - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 43 - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 44 - * 45 7 * The contents of this header was split off from videodev2.h. All control 46 8 * definitions should be added to this header, which is included by 47 9 * videodev2.h.
-9
include/uapi/linux/v4l2-dv-timings.h
··· 3 3 * V4L2 DV timings header. 4 4 * 5 5 * Copyright (C) 2012-2016 Hans Verkuil <hans.verkuil@cisco.com> 6 - * 7 - * This program is free software; you can redistribute it and/or 8 - * modify it under the terms of the GNU General Public License 9 - * version 2 as published by the Free Software Foundation. 10 - * 11 - * This program is distributed in the hope that it will be useful, but 12 - * WITHOUT ANY WARRANTY; without even the implied warranty of 13 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 - * General Public License for more details. 15 6 */ 16 7 17 8 #ifndef _V4L2_DV_TIMINGS_H
-4
include/uapi/linux/v4l2-mediabus.h
··· 3 3 * Media Bus API header 4 4 * 5 5 * Copyright (C) 2009, Guennadi Liakhovetski <g.liakhovetski@gmx.de> 6 - * 7 - * This program is free software; you can redistribute it and/or modify 8 - * it under the terms of the GNU General Public License version 2 as 9 - * published by the Free Software Foundation. 10 6 */ 11 7 12 8 #ifndef __LINUX_V4L2_MEDIABUS_H
-13
include/uapi/linux/v4l2-subdev.h
··· 6 6 * 7 7 * Contacts: Laurent Pinchart <laurent.pinchart@ideasonboard.com> 8 8 * Sakari Ailus <sakari.ailus@iki.fi> 9 - * 10 - * This program is free software; you can redistribute it and/or modify 11 - * it under the terms of the GNU General Public License version 2 as 12 - * published by the Free Software Foundation. 13 - * 14 - * This program is distributed in the hope that it will be useful, 15 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 16 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 17 - * GNU General Public License for more details. 18 - * 19 - * You should have received a copy of the GNU General Public License 20 - * along with this program; if not, write to the Free Software 21 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 22 9 */ 23 10 24 11 #ifndef __LINUX_V4L2_SUBDEV_H