From 6c666e22612452b7563640b5a8b50acc43d7d8bb Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Mon, 7 Jun 2010 10:46:10 +0300
Subject: [PATCH] --- yaml --- r: 200451 b: refs/heads/master c:
 bc092a303a1b980c67324920471e23354b0721cd h: refs/heads/master i:   200449:
 8a9b311ce3bd1d369a95df1a9a0c15222bcd545a   200447:
 5477c921eea1c762f8b5ca0a36110f8eb6a24201 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/video/omap/rfbi.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 438d666a00ef..ee2adb7cf323 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 256a8042830e6ac1c3dd2e912e3c45769dd709cc
+refs/heads/master: bc092a303a1b980c67324920471e23354b0721cd
diff --git a/trunk/drivers/video/omap/rfbi.c b/trunk/drivers/video/omap/rfbi.c
index 1162603c72e5..eada9f12efc7 100644
--- a/trunk/drivers/video/omap/rfbi.c
+++ b/trunk/drivers/video/omap/rfbi.c
@@ -26,6 +26,7 @@
 #include <linux/interrupt.h>
 #include <linux/clk.h>
 #include <linux/io.h>
+#include <linux/platform_device.h>
 
 #include "omapfb.h"
 #include "dispc.h"
@@ -83,13 +84,13 @@ static inline u32 rfbi_read_reg(int idx)
 
 static int rfbi_get_clocks(void)
 {
-	rfbi.dss_ick = clk_get(&dispc.fbdev->dssdev->dev, "ick");
+	rfbi.dss_ick = clk_get(&rfbi.fbdev->dssdev->dev, "ick");
 	if (IS_ERR(rfbi.dss_ick)) {
 		dev_err(rfbi.fbdev->dev, "can't get ick\n");
 		return PTR_ERR(rfbi.dss_ick);
 	}
 
-	rfbi.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck");
+	rfbi.dss1_fck = clk_get(&rfbi.fbdev->dssdev->dev, "dss1_fck");
 	if (IS_ERR(rfbi.dss1_fck)) {
 		dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n");
 		clk_put(rfbi.dss_ick);