diff options
| author | Sean Paul <seanpaul@chromium.org> | 2018-02-16 23:47:43 +0300 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2018-02-16 23:47:43 +0300 |
| commit | d4da404f36b24b089d20db1fb27d8f99cb66f409 (patch) | |
| tree | 349c4b792281826652eb9e6d7a46ed6622dc90de /drivers/gpu/drm/rockchip | |
| parent | fa4127c5eb8def998fd8a471d51a4f2560dea0a2 (diff) | |
| parent | 933519a5a269d8460450545adefcb5caec622cac (diff) | |
| download | linux-d4da404f36b24b089d20db1fb27d8f99cb66f409.tar.xz | |
Merge airlied/drm-next into drm-misc-next
Backmerge 4.15 and hdcp topic branch
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/rockchip')
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_lvds.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c index 84911bdc27d1..e67f4ea28c0e 100644 --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c @@ -25,6 +25,7 @@ #include <linux/clk.h> #include <linux/mfd/syscon.h> #include <linux/of_graph.h> +#include <linux/pinctrl/devinfo.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/reset.h> |