diff options
author | Frank Chen <frankc@nvidia.com> | 2011-06-29 17:28:10 -0700 |
---|---|---|
committer | Manish Tuteja <mtuteja@nvidia.com> | 2011-07-04 04:26:38 -0700 |
commit | 17cf593083f77b5a86ea29ab73741ce2950778ae (patch) | |
tree | 9640b70f1c23f1bd5ac75db4182f6b46b0dd4e15 | |
parent | cb38551403684b15911bbf8b83876d72b57260b1 (diff) |
media: video: update copyright headers
update headers for camera files
bug 846086
Change-Id: I1986152a0edc184a458e5be1bc98a480b1badfd6
Reviewed-on: http://git-master/r/39141
Tested-by: Frank Chen <frankc@nvidia.com>
Reviewed-by: Erik M Lilliebjerg <elilliebjerg@nvidia.com>
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
-rw-r--r-- | include/media/ov2710.h | 23 | ||||
-rw-r--r-- | include/media/soc380.h | 35 | ||||
-rw-r--r-- | include/media/ssl3250a.h | 36 |
3 files changed, 72 insertions, 22 deletions
diff --git a/include/media/ov2710.h b/include/media/ov2710.h index 88cf341b96c8..e3d43056d700 100644 --- a/include/media/ov2710.h +++ b/include/media/ov2710.h @@ -1,11 +1,20 @@ -/** - * Copyright (c) 2011 NVIDIA Corporation. All rights reserved. +/* + * Copyright (C) 2010 Motorola, Inc. + * Copyright (C) 2011 NVIDIA Corporation. * - * NVIDIA Corporation and its licensors retain all intellectual property - * and proprietary rights in and to this software and related documentation - * and any modifications thereto. Any use, reproduction, disclosure or - * distribution of this software and related documentation without an express - * license agreement from NVIDIA Corporation is strictly prohibited. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 */ #ifndef __OV2710_H__ diff --git a/include/media/soc380.h b/include/media/soc380.h index 0cf1744dd022..254625f74f82 100644 --- a/include/media/soc380.h +++ b/include/media/soc380.h @@ -1,11 +1,32 @@ -/** - * Copyright (c) 2011 NVIDIA Corporation. All rights reserved. +/* + * Copyright (c) 2011, NVIDIA CORPORATION, All rights reserved. * - * NVIDIA Corporation and its licensors retain all intellectual property - * and proprietary rights in and to this software and related documentation - * and any modifications thereto. Any use, reproduction, disclosure or - * distribution of this software and related documentation without an express - * license agreement from NVIDIA Corporation is strictly prohibited. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * Neither the name of NVIDIA CORPORATION nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef __SOC380_H__ diff --git a/include/media/ssl3250a.h b/include/media/ssl3250a.h index d524569feb30..ebe2804b348a 100644 --- a/include/media/ssl3250a.h +++ b/include/media/ssl3250a.h @@ -1,13 +1,33 @@ -/** - * Copyright (c) 2011 NVIDIA Corporation. All rights reserved. +/* + * Copyright (c) 2011, NVIDIA CORPORATION, All rights reserved. * - * NVIDIA Corporation and its licensors retain all intellectual property - * and proprietary rights in and to this software and related documentation - * and any modifications thereto. Any use, reproduction, disclosure or - * distribution of this software and related documentation without an express - * license agreement from NVIDIA Corporation is strictly prohibited. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * Neither the name of NVIDIA CORPORATION nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #ifndef __SSL3250A_H__ #define __SSL3250A_H__ |