[media] drx-j: put under 3-clause BSD license

Relicense the drx-j driver under a standard 3-clause BSD license, which makes
it GPL compatible.

This was done explicitly with permission from Trident Microsystems.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/dvb-frontends/drx39xyj/bsp_host.h b/drivers/media/dvb-frontends/drx39xyj/bsp_host.h
index 30f711d..95b5232 100644 (file)
--- a/drivers/media/dvb-frontends/drx39xyj/bsp_host.h
+++ b/drivers/media/dvb-frontends/drx39xyj/bsp_host.h
@@ -1,3 +1,33 @@
+/*
+  Copyright (c), 2004-2005,2007-2010 Trident Microsystems, Inc.
+  All rights reserved.
+
+  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 Trident Microsystems nor Hauppauge Computer Works
+    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.
+*/
+
 /**
 * \file $Id: bsp_host.h,v 1.3 2009/07/07 14:20:30 justin Exp $
 *
@@ -5,38 +35,6 @@
 *
 */
 
-/*
-* $(c) 2004-2005,2007-2009 Trident Microsystems, Inc. - All rights reserved.
-*
-* This software and related documentation (the 'Software') are intellectual
-* property owned by Trident and are copyright of Trident, unless specifically
-* noted otherwise.
-*
-* Any use of the Software is permitted only pursuant to the terms of the
-* license agreement, if any, which accompanies, is included with or applicable
-* to the Software ('License Agreement') or upon express written consent of
-* Trident. Any copying, reproduction or redistribution of the Software in
-* whole or in part by any means not in accordance with the License Agreement
-* or as agreed in writing by Trident is expressly prohibited.
-*
-* THE SOFTWARE IS WARRANTED, IF AT ALL, ONLY ACCORDING TO THE TERMS OF THE
-* LICENSE AGREEMENT. EXCEPT AS WARRANTED IN THE LICENSE AGREEMENT THE SOFTWARE
-* IS DELIVERED 'AS IS' AND TRIDENT HEREBY DISCLAIMS ALL WARRANTIES AND
-* CONDITIONS WITH REGARD TO THE SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
-* AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIT
-* ENJOYMENT, TITLE AND NON-INFRINGEMENT OF ANY THIRD PARTY INTELLECTUAL
-* PROPERTY OR OTHER RIGHTS WHICH MAY RESULT FROM THE USE OR THE INABILITY
-* TO USE THE SOFTWARE.
-*
-* IN NO EVENT SHALL TRIDENT BE LIABLE FOR INDIRECT, INCIDENTAL, CONSEQUENTIAL,
-* PUNITIVE, SPECIAL OR OTHER DAMAGES WHATSOEVER INCLUDING WITHOUT LIMITATION,
-* DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS
-* INFORMATION, AND THE LIKE, ARISING OUT OF OR RELATING TO THE USE OF OR THE
-* INABILITY TO USE THE SOFTWARE, EVEN IF TRIDENT HAS BEEN ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGES, EXCEPT PERSONAL INJURY OR DEATH RESULTING FROM
-* TRIDENT'S NEGLIGENCE.                                                        $
-*
-*/
 #ifndef __DRXBSP_HOST_H__
 #define __DRXBSP_HOST_H__
 /*-------------------------------------------------------------------------

diff --cc drivers/media/dvb-frontends/drx39xyj/bsp_i2c.h
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/bsp_tuner.h
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/bsp_types.h
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drx39xxj.c
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drx39xxj.h
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.c
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.h
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drx_driver.c
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drx_driver.h
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drx_driver_version.h
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drxj.c
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drxj.h
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drxj_map.h
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drxj_mc.h
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drxj_mc_vsb.h
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drxj_mc_vsbqam.h
Simple merge

diff --cc drivers/media/dvb-frontends/drx39xyj/drxj_options.h
Simple merge