aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierrick Hascoet <pierrick.hascoet@abilis.com>2011-10-31 11:24:49 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 05:43:53 -0400
commit315cadc446714c5c1a406afff6f53aa80d1e267e (patch)
tree4022d0a5ce7bb3981be9f94d69169bea1ff44c74
parent4f7b7c01fd2ca12c6c2d9eaa2a63e1c534f372ae (diff)
[media] staging: as102: Fix licensing oversight
Fix a couple of files which were supposed by be relicensed as GPL but were overlooked. Signed-off-by: Pierrick Hascoet <pierrick.hascoet@abilis.com> Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com> Signed-off-by: Piotr Chmura <chmooreck@poczta.onet.pl> Signed-off-by: Sylwester Nawrocki <snjw23@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/staging/media/as102/as10x_cmd_cfg.c35
-rw-r--r--drivers/staging/media/as102/as10x_cmd_stream.c37
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 7b22e190c701..0635797232e5 100644
--- a/drivers/staging/media/as102/as10x_cmd_cfg.c
+++ b/drivers/staging/media/as102/as10x_cmd_cfg.c
@@ -1,20 +1,21 @@
1/** 1/*
2 2 * Abilis Systems Single DVB-T Receiver
3 \file as10x_cmd_cfg.c 3 * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.com>
4 4 *
5 \author: S. Martinelli 5 * This program is free software; you can redistribute it and/or modify
6 6 * it under the terms of the GNU General Public License as published by
7 ----------------------------------------------------------------------------\n 7 * the Free Software Foundation; either version 2, or (at your option)
8 (c) Copyright Abilis Systems SARL 2005-2009 All rigths reserved \n 8 * any later version.
9 www.abilis.com \n 9 *
10 ----------------------------------------------------------------------------\n 10 * This program is distributed in the hope that it will be useful,
11 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 \brief AS10x API, configuration services 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 13 * GNU General Public License for more details.
14 AS10x cmd management: build command buffer, send command through 14 *
15 selected port and wait for the response when required. 15 * You should have received a copy of the GNU General Public License
16 16 * along with this program; if not, write to the Free Software
17*/ 17 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18 */
18 19
19#if defined(LINUX) && defined(__KERNEL__) /* linux kernel implementation */ 20#if defined(LINUX) && defined(__KERNEL__) /* linux kernel implementation */
20#include <linux/kernel.h> 21#include <linux/kernel.h>
diff --git a/drivers/staging/media/as102/as10x_cmd_stream.c b/drivers/staging/media/as102/as10x_cmd_stream.c
index 8705894d51c7..b5e6254ade48 100644
--- a/drivers/staging/media/as102/as10x_cmd_stream.c
+++ b/drivers/staging/media/as102/as10x_cmd_stream.c
@@ -1,22 +1,21 @@
1/** 1/*
2 2 * Abilis Systems Single DVB-T Receiver
3 \file as10x_cmd_stream.c 3 * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.com>
4 4 *
5 \author: S. Martinelli 5 * This program is free software; you can redistribute it and/or modify
6 6 * it under the terms of the GNU General Public License as published by
7 ----------------------------------------------------------------------------\n 7 * the Free Software Foundation; either version 2, or (at your option)
8 (c) Copyright Abilis Systems SARL 2005-2009 All rigths reserved \n 8 * any later version.
9 www.abilis.com \n 9 *
10 ----------------------------------------------------------------------------\n 10 * This program is distributed in the hope that it will be useful,
11 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 \brief AS10x CMD, stream services 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 13 * GNU General Public License for more details.
14 AS10x CMD management: build command buffer, send command through 14 *
15 selected port and wait for the response when required. 15 * You should have received a copy of the GNU General Public License
16 16 * along with this program; if not, write to the Free Software
17*/ 17 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18 18 */
19
20#if defined(LINUX) && defined(__KERNEL__) /* linux kernel implementation */ 19#if defined(LINUX) && defined(__KERNEL__) /* linux kernel implementation */
21#include <linux/kernel.h> 20#include <linux/kernel.h>
22#include "as102_drv.h" 21#include "as102_drv.h"