crownbay: update a handful of EMGD licenses
Subsystems (2)
PATCH 1/1 crownbay: update a handful of EMGD licenses
From: Tom Zanussi <[email protected]>
The version of the EMGD driver we use had a few included license mistakes. Correct these as per upstream.
Signed-off-by Tom Zanussi <[email protected]>
--- drivers/gpu/drm/emgd/emgd/pal/Makefile.include | 39 ++-- .../emgd/pvr/services4/system/common/sysconfig.c | 287 ++++++++++---------- .../drm/emgd/pvr/services4/system/plb/sysconfig.c | 64 +++--- .../drm/emgd/pvr/services4/system/tnc/sysconfig.c | 64 +++--- .../gpu/drm/emgd/pvr/services4/system/tnc/systnc.h | 48 ++-- 5 files changed, 246 insertions(+), 256 deletions(-)
drivers/gpu/drm/emgd/emgd/pal/Makefile.include +20 -19
@@ -1,25 +1,26 @@ #---------------------------------------------------------------------------- # Filename: Makefile.include -# $Revision: 1.1 $ +# $Revision: 1.2 $ #---------------------------------------------------------------------------- -# INTEL CONFIDENTIAL -# Copyright (2002-2008) Intel Corporation All Rights Reserved. -# The source code contained or described herein and all documents related to -# the source code ("Material") are owned by Intel Corporation or its suppliers -# or licensors. Title to the Material remains with Intel Corporation or its -# suppliers and licensors. The Material contains trade secrets and proprietary -# and confidential information of Intel or its suppliers and licensors. The -# Material is protected by worldwide copyright and trade secret laws and -# treaty provisions. No part of the Material may be used, copied, reproduced, -# modified, published, uploaded, posted, transmitted, distributed, or -# disclosed in any way without Intel's prior express written permission. -# -# No license under any patent, copyright, trade secret or other intellectual -# property right is granted to or conferred upon you by disclosure or -# delivery of the Materials, either expressly, by implication, inducement, -# estoppel or otherwise. Any license under such intellectual property rights -# must be express and approved by Intel in writing. -# +# Copyright � 2002-2010, Intel Corporation. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. #---------------------------------------------------------------------------- ifeq ($(origin EGD_CFG), undefined)
drivers/gpu/drm/emgd/pvr/services4/system/common/sysconfig.c +142 -145
797 lines not on this page · raw message
drivers/gpu/drm/emgd/pvr/services4/system/plb/sysconfig.c +32 -32
71 lines not on this page · raw message
drivers/gpu/drm/emgd/pvr/services4/system/tnc/sysconfig.c +32 -32
71 lines not on this page · raw message
drivers/gpu/drm/emgd/pvr/services4/system/tnc/systnc.h +20 -28
60 lines not on this page · raw message
Signature · 1 line
1.7.0.4