From patchwork Mon Oct 31 16:24:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 8256 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1RKugQ-0003u1-TA; Mon, 31 Oct 2011 17:26:07 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-1) with esmtp id 1RKugQ-0003gr-Jw; Mon, 31 Oct 2011 17:25:58 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754747Ab1JaQZy (ORCPT + 3 others); Mon, 31 Oct 2011 12:25:54 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:58562 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754695Ab1JaQZx (ORCPT ); Mon, 31 Oct 2011 12:25:53 -0400 Received: by mail-ey0-f174.google.com with SMTP id 27so5444327eye.19 for ; Mon, 31 Oct 2011 09:25:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=xHFAF2nf8KgqYs1r2PNh3MUoXxTpQ5XvASiJc9cQh/s=; b=Bv/Kh3h4IxYSuS7Sz2EzQtfDTQP0Nn+pvGm3o8GuIGBEFcmAEd6BAvPPxUON/XMOHd ATqJe/8h0E5+X3A/aOdJEDKE9IaPHvo1eV/jawVi5pLNvfA0Wtxry+7K4ZydLphrnc7p liTJ3FtBJwZueTmbGTR0NZJFbqsShPCbiXsP8= Received: by 10.14.4.142 with SMTP id 14mr1326249eej.38.1320078351907; Mon, 31 Oct 2011 09:25:51 -0700 (PDT) Received: from localhost.localdomain (84-dzi-26.acn.waw.pl. [85.222.29.84]) by mx.google.com with ESMTPS id z58sm52444586eea.3.2011.10.31.09.25.49 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 31 Oct 2011 09:25:51 -0700 (PDT) From: Sylwester Nawrocki To: devel@driverdev.osuosl.org, linux-media@vger.kernel.org Cc: Piotr Chmura , Devin Heitmueller , Mauro Carvalho Chehab , Sylwester Nawrocki , Stefan Richter , Greg KH , Pierrick Hascoet Subject: [PATCH 11/17] staging: as102: Fix licensing oversight Date: Mon, 31 Oct 2011 17:24:49 +0100 Message-Id: <1320078295-3379-12-git-send-email-snjw23@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1320078295-3379-1-git-send-email-snjw23@gmail.com> References: <1320078295-3379-1-git-send-email-snjw23@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.10.31.161514 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, BODY_SIZE_4000_4999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NS ' X-LSpam-Score: -4.2 (----) X-LSpam-Report: No, score=-4.2 required=5.0 tests=BAYES_00=-1.9, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_MED=-2.3, T_DKIM_INVALID=0.01 autolearn=ham From: Pierrick Hascoet Fix a couple of files which were supposed by be relicensed as GPL but were overlooked. Signed-off-by: Pierrick Hascoet Signed-off-by: Devin Heitmueller Signed-off-by: Piotr Chmura Signed-off-by: Sylwester Nawrocki --- drivers/staging/media/as102/as10x_cmd_cfg.c | 35 +++++++++++----------- drivers/staging/media/as102/as10x_cmd_stream.c | 37 +++++++++++------------ 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/drivers/staging/media/as102/as10x_cmd_cfg.c b/drivers/staging/media/as102/as10x_cmd_cfg.c index 7b22e19..0635797 100644 --- a/drivers/staging/media/as102/as10x_cmd_cfg.c +++ b/drivers/staging/media/as102/as10x_cmd_cfg.c @@ -1,20 +1,21 @@ -/** - - \file as10x_cmd_cfg.c - - \author: S. Martinelli - - ----------------------------------------------------------------------------\n - (c) Copyright Abilis Systems SARL 2005-2009 All rigths reserved \n - www.abilis.com \n - ----------------------------------------------------------------------------\n - - \brief AS10x API, configuration services - - AS10x cmd management: build command buffer, send command through - selected port and wait for the response when required. - -*/ +/* + * Abilis Systems Single DVB-T Receiver + * Copyright (C) 2008 Pierrick Hascoet + * + * 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, 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #if defined(LINUX) && defined(__KERNEL__) /* linux kernel implementation */ #include diff --git a/drivers/staging/media/as102/as10x_cmd_stream.c b/drivers/staging/media/as102/as10x_cmd_stream.c index 8705894..b5e6254 100644 --- a/drivers/staging/media/as102/as10x_cmd_stream.c +++ b/drivers/staging/media/as102/as10x_cmd_stream.c @@ -1,22 +1,21 @@ -/** - - \file as10x_cmd_stream.c - - \author: S. Martinelli - - ----------------------------------------------------------------------------\n - (c) Copyright Abilis Systems SARL 2005-2009 All rigths reserved \n - www.abilis.com \n - ----------------------------------------------------------------------------\n - - \brief AS10x CMD, stream services - - AS10x CMD management: build command buffer, send command through - selected port and wait for the response when required. - -*/ - - +/* + * Abilis Systems Single DVB-T Receiver + * Copyright (C) 2008 Pierrick Hascoet + * + * 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, 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #if defined(LINUX) && defined(__KERNEL__) /* linux kernel implementation */ #include #include "as102_drv.h"