Commit b20deecf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: media: zoran: add proper SPDX identifiers on files that did not have them. 



There were a few files for the zoran driver that did not have SPDX
identifiers on them, so fix that up.  At the same time, remove the "free
form" text that specified the license of the file, as that is impossible
for any tool to properly parse.

Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: linux-media@vger.kernel.org
Cc: mjpeg-users@lists.sourceforge.net
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b36bcbe5

drivers/staging/media/zoran/videocodec.h

+1 −16
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/*

 * VIDEO MOTION CODECs internal API for video devices

 *
@@ -5,22 +6,6 @@ 
 * bound to a master device.

 *

 * (c) 2002 Wolfgang Scherr <scherr@net4you.at>

 *

 * $Id: videocodec.h,v 1.1.2.4 2003/01/14 21:15:03 rbultje Exp $

 *

 * ------------------------------------------------------------------------

 *

 * 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.

 *

 * ------------------------------------------------------------------------

 */



/* =================== */

drivers/staging/media/zoran/zoran.h

+1 −11
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/*

 * zoran - Iomega Buz driver

 *
@@ -12,18 +13,7 @@ 
 * bttv - Bt848 frame grabber driver

 * Copyright (C) 1996,97,98 Ralph  Metzler (rjkm@thp.uni-koeln.de)

 *                        & Marcus Metzler (mocm@thp.uni-koeln.de)

 *

 * 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.

 */



#ifndef _BUZ_H_

#define _BUZ_H_

drivers/staging/media/zoran/zoran_card.c

+1 −11
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Zoran zr36057/zr36067 PCI controller driver, for the

 * Pinnacle/Miro DC10/DC10+/DC30/DC30+, Iomega Buz, Linux
@@ -11,18 +12,7 @@ 
 *   Ronald Bultje    <rbultje@ronald.bitfreak.net>

 *   Laurent Pinchart <laurent.pinchart@skynet.be>

 *   Mailinglist      <mjpeg-users@lists.sf.net>

 *

 * 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 <linux/delay.h>



#include <linux/types.h>

drivers/staging/media/zoran/zoran_card.h

+1 −11
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/*

 * Zoran zr36057/zr36067 PCI controller driver, for the

 * Pinnacle/Miro DC10/DC10+/DC30/DC30+, Iomega Buz, Linux
@@ -11,18 +12,7 @@ 
 *   Ronald Bultje    <rbultje@ronald.bitfreak.net>

 *   Laurent Pinchart <laurent.pinchart@skynet.be>

 *   Mailinglist      <mjpeg-users@lists.sf.net>

 *

 * 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.

 */



#ifndef __ZORAN_CARD_H__

#define __ZORAN_CARD_H__

drivers/staging/media/zoran/zoran_device.c

+1 −11
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Zoran zr36057/zr36067 PCI controller driver, for the

 * Pinnacle/Miro DC10/DC10+/DC30/DC30+, Iomega Buz, Linux
@@ -11,18 +12,7 @@ 
 *   Ronald Bultje    <rbultje@ronald.bitfreak.net>

 *   Laurent Pinchart <laurent.pinchart@skynet.be>

 *   Mailinglist      <mjpeg-users@lists.sf.net>

 *

 * 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 <linux/types.h>

#include <linux/kernel.h>

#include <linux/module.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE