From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Mon, 6 Jun 2016 07:16:51 +0000 (+0300)
Subject: Merge branch '4.8/omapdrm-pll' (omapdrm PLL work)
X-Git-Tag: v4.8-rc1~62^2~39^2~5
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=ecf140dfc3fe169aaff8f5561d345f6b96d7b476

Merge branch '4.8/omapdrm-pll' (omapdrm PLL work)

Merge omapdrm PLL work, which makes it possible to use the DSS PLLs in a
versatile manner, for example, HDMI PLL can be used for LCDs.
---

ecf140dfc3fe169aaff8f5561d345f6b96d7b476
diff --cc drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
index f1015e8b8267,ac866d23c2dc..dc0212a9754e
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
@@@ -16,7 -16,7 +16,8 @@@
  #include <linux/io.h>
  #include <linux/platform_device.h>
  #include <linux/clk.h>
 +#include <linux/seq_file.h>
+ #include <linux/pm_runtime.h>
  
  #include <video/omapdss.h>