From 561e9b0f46e61e02dfa200f85be5bda6db3cae70 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Wed, 12 Dec 2012 14:24:07 +0530
Subject: [PATCH] --- yaml --- r: 345623 b: refs/heads/master c:
 65da03507735f288b2c6250def1f5142bf6d5667 h: refs/heads/master i:   345621:
 65b3f243a1d0406bfce993b7d246b56c3feffba3   345619:
 f9c32c540a88bdb0a4d4b444edb4788b9d4bb8b1   345615:
 7a752a9a120409add6cf5d044fcf87aa1adc4b2e v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/gpu/drm/exynos/exynos_ddc.c     | 4 +++-
 trunk/drivers/gpu/drm/exynos/exynos_hdmi.c    | 4 +++-
 trunk/drivers/gpu/drm/exynos/exynos_hdmiphy.c | 4 +++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 01ca4803f3a5..7fcdeb6c9f4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a55622570dc3e2d294db2ca7677cc32d65dfbf33
+refs/heads/master: 65da03507735f288b2c6250def1f5142bf6d5667
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_ddc.c b/trunk/drivers/gpu/drm/exynos/exynos_ddc.c
index 37e6ec704e1d..bef43e0342a6 100644
--- a/trunk/drivers/gpu/drm/exynos/exynos_ddc.c
+++ b/trunk/drivers/gpu/drm/exynos/exynos_ddc.c
@@ -48,6 +48,7 @@ static struct i2c_device_id ddc_idtable[] = {
 	{ },
 };
 
+#ifdef CONFIG_OF
 static struct of_device_id hdmiddc_match_types[] = {
 	{
 		.compatible = "samsung,exynos5-hdmiddc",
@@ -55,12 +56,13 @@ static struct of_device_id hdmiddc_match_types[] = {
 		/* end node */
 	}
 };
+#endif
 
 struct i2c_driver ddc_driver = {
 	.driver = {
 		.name = "exynos-hdmiddc",
 		.owner = THIS_MODULE,
-		.of_match_table = hdmiddc_match_types,
+		.of_match_table = of_match_ptr(hdmiddc_match_types),
 	},
 	.id_table	= ddc_idtable,
 	.probe		= s5p_ddc_probe,
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_hdmi.c b/trunk/drivers/gpu/drm/exynos/exynos_hdmi.c
index 68936e6aa6ab..e009216e4a3c 100644
--- a/trunk/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/trunk/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -2440,6 +2440,7 @@ static struct platform_device_id hdmi_driver_types[] = {
 	}
 };
 
+#ifdef CONFIG_OF
 static struct of_device_id hdmi_match_types[] = {
 	{
 		.compatible = "samsung,exynos5-hdmi",
@@ -2448,6 +2449,7 @@ static struct of_device_id hdmi_match_types[] = {
 		/* end node */
 	}
 };
+#endif
 
 static int __devinit hdmi_probe(struct platform_device *pdev)
 {
@@ -2710,6 +2712,6 @@ struct platform_driver hdmi_driver = {
 		.name	= "exynos-hdmi",
 		.owner	= THIS_MODULE,
 		.pm	= &hdmi_pm_ops,
-		.of_match_table = hdmi_match_types,
+		.of_match_table = of_match_ptr(hdmi_match_types),
 	},
 };
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_hdmiphy.c b/trunk/drivers/gpu/drm/exynos/exynos_hdmiphy.c
index 27d1720f1bbd..6206056f4a33 100644
--- a/trunk/drivers/gpu/drm/exynos/exynos_hdmiphy.c
+++ b/trunk/drivers/gpu/drm/exynos/exynos_hdmiphy.c
@@ -46,6 +46,7 @@ static const struct i2c_device_id hdmiphy_id[] = {
 	{ },
 };
 
+#ifdef CONFIG_OF
 static struct of_device_id hdmiphy_match_types[] = {
 	{
 		.compatible = "samsung,exynos5-hdmiphy",
@@ -53,12 +54,13 @@ static struct of_device_id hdmiphy_match_types[] = {
 		/* end node */
 	}
 };
+#endif
 
 struct i2c_driver hdmiphy_driver = {
 	.driver = {
 		.name	= "exynos-hdmiphy",
 		.owner	= THIS_MODULE,
-		.of_match_table = hdmiphy_match_types,
+		.of_match_table = of_match_ptr(hdmiphy_match_types),
 	},
 	.id_table = hdmiphy_id,
 	.probe		= hdmiphy_probe,