diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2019-06-25 08:42:25 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2019-06-25 08:42:25 -0500 |
commit | d7929c1e13e3788e7cb741d75b5baec5e53eff21 (patch) | |
tree | cf513071edfc4499b4e025e4846244c9d0e4c6bd /drivers/clk/sunxi/clk-sun8i-apb0.c | |
parent | drm/amdgpu: disable gfxoff on navi10 (diff) | |
parent | drm/edid: use for_each_displayid_db where applicable (diff) | |
download | linux-dev-d7929c1e13e3788e7cb741d75b5baec5e53eff21.tar.xz linux-dev-d7929c1e13e3788e7cb741d75b5baec5e53eff21.zip |
Merge branch 'drm-next' into drm-next-5.3
Backmerge drm-next and fix up conflicts due to drmP.h removal.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/clk/sunxi/clk-sun8i-apb0.c')
-rw-r--r-- | drivers/clk/sunxi/clk-sun8i-apb0.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/sunxi/clk-sun8i-apb0.c b/drivers/clk/sunxi/clk-sun8i-apb0.c index 5a7d4dd09e85..fc5d6e3b77d1 100644 --- a/drivers/clk/sunxi/clk-sun8i-apb0.c +++ b/drivers/clk/sunxi/clk-sun8i-apb0.c @@ -1,17 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2014 Chen-Yu Tsai * Author: Chen-Yu Tsai <wens@csie.org> * * Allwinner A23 APB0 clock driver * - * License Terms: GNU General Public License v2 - * * Based on clk-sun6i-apb0.c * Allwinner A31 APB0 clock driver * * Copyright (C) 2014 Free Electrons * Author: Boris BREZILLON <boris.brezillon@free-electrons.com> - * */ #include <linux/clk-provider.h> |