diff options
| author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2019-10-15 11:18:26 +0300 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2019-10-15 11:18:26 +0300 |
| commit | fa41d6ee904266fa8739cafa6ec038c3a8e435b7 (patch) | |
| tree | 4d5439bafd38dc730838bb15e6a49e747793d4a7 /drivers/clk/st/clkgen-fsyn.c | |
| parent | 9cd20ef7803cc53a00c6eb7198b3d870ac7b3766 (diff) | |
| parent | 7ed093602e0e1b60a0fc074a9692687e7d2b723d (diff) | |
| download | linux-fa41d6ee904266fa8739cafa6ec038c3a8e435b7.tar.xz | |
Merge drm/drm-next into drm-intel-next-queued
Backmerging to pull in HDR DP code:
https://lists.freedesktop.org/archives/dri-devel/2019-September/236453.html
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/clk/st/clkgen-fsyn.c')
| -rw-r--r-- | drivers/clk/st/clkgen-fsyn.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/clk/st/clkgen-fsyn.c b/drivers/clk/st/clkgen-fsyn.c index ca1ccdb8a3b1..a156bd0c6af7 100644 --- a/drivers/clk/st/clkgen-fsyn.c +++ b/drivers/clk/st/clkgen-fsyn.c @@ -67,7 +67,6 @@ struct clkgen_quadfs_data { }; static const struct clk_ops st_quadfs_pll_c32_ops; -static const struct clk_ops st_quadfs_fs660c32_ops; static int clk_fs660c32_dig_get_params(unsigned long input, unsigned long output, struct stm_fs *fs); |