From: Zheng Yang <zhengyang@rock-chips.com>
Date: Mon, 2 Feb 2015 07:04:21 +0000 (+0800)
Subject: hdmi: depends on DRM_ROCKCHIP and fix document error.
X-Git-Tag: firefly_0821_release~4263^2~61
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=2fce7ea41153b460ed9410cc8d08a171c4eb970f;p=firefly-linux-kernel-4.4.55.git

hdmi: depends on DRM_ROCKCHIP and fix document error.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
---

diff --git a/Documentation/devicetree/bindings/video/rockchip_hdmi.txt b/Documentation/devicetree/bindings/video/rockchip_hdmi.txt
index cdea37199f54..9bd5eb06ac2c 100644
--- a/Documentation/devicetree/bindings/video/rockchip_hdmi.txt
+++ b/Documentation/devicetree/bindings/video/rockchip_hdmi.txt
@@ -1,7 +1,7 @@
 Device-Tree bindings for rockchip hdmi driver
 
 Required properties:
-- compatible: value should be following value:
+- compatible: value should be following:
 	"rockchip,rk3288-hdmi",
 	"rockchip,rk3368-hdmi",
 	"rockchip,rk3036-hdmi",
diff --git a/drivers/video/rockchip/hdmi/Kconfig b/drivers/video/rockchip/hdmi/Kconfig
index ed16d20bfb76..aead78ade0b9 100644
--- a/drivers/video/rockchip/hdmi/Kconfig
+++ b/drivers/video/rockchip/hdmi/Kconfig
@@ -1,6 +1,6 @@
 menuconfig RK_HDMI
        bool "Rockchip HDMI support"
-       depends on FB_ROCKCHIP
+       depends on FB_ROCKCHIP || DRM_ROCKCHIP
        select FB_MODE_HELPERS
 
 source "drivers/video/rockchip/hdmi/rockchip-hdmiv1/Kconfig"