diff options
author | Joerg Roedel | 2019-06-24 10:23:16 +0200 |
---|---|---|
committer | Joerg Roedel | 2019-06-24 10:23:16 +0200 |
commit | ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5 (patch) | |
tree | e19c18292231202e9cd8d484ee43f46b2c9c9ad1 /drivers/media/platform/rockchip/rga/rga-hw.c | |
parent | iommu/dma: Fix condition check in iommu_dma_unmap_sg (diff) | |
parent | Linux 5.2-rc6 (diff) | |
download | kernel-qcow2-linux-ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5.tar.gz kernel-qcow2-linux-ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5.tar.xz kernel-qcow2-linux-ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5.zip |
Merge tag 'v5.2-rc6' into generic-dma-ops
Linux 5.2-rc6
Diffstat (limited to 'drivers/media/platform/rockchip/rga/rga-hw.c')
-rw-r--r-- | drivers/media/platform/rockchip/rga/rga-hw.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/media/platform/rockchip/rga/rga-hw.c b/drivers/media/platform/rockchip/rga/rga-hw.c index 843e50d17a72..4be6dcf292ff 100644 --- a/drivers/media/platform/rockchip/rga/rga-hw.c +++ b/drivers/media/platform/rockchip/rga/rga-hw.c @@ -1,15 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd * Author: Jacob Chen <jacob-chen@iotwrt.com> - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * 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. */ #include <linux/pm_runtime.h> |