summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2020-01-07 04:43:24 +0100
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-02-24 16:10:39 +0100
commitbfaaa20df9f5e70ef6c4e610ce563ee7ea40b530 (patch)
tree2ae9f186ca7840c399ef7a80a555d8d9af2b6ade /drivers
parent39857de4f82f1458842edd7f3a9f2e82ab48b479 (diff)
media: video: aspeed: Update copyright information
Use the preferred form for GPL2+, and add IBM and Intel as the authors. The driver was initially upstreamed by Eddie from IBM, and has had major contributions from Jae at Intel. Signed-off-by: Joel Stanley <joel@jms.id.au> Acked-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> Reviewed-by: Eddie James <eajames@linux.ibm.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/platform/aspeed-video.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
index c55dfdb34a54..ef9c09298461 100644
--- a/drivers/media/platform/aspeed-video.c
+++ b/drivers/media/platform/aspeed-video.c
@@ -1,4 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 IBM Corp.
+// Copyright (c) 2019 Intel Corporation
#include <linux/atomic.h>
#include <linux/bitfield.h>