From cba86dcaa1e700d323e7909e8300f02dd0ed8eb3 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Fri, 28 Oct 2011 15:26:26 +0300
Subject: [PATCH] --- yaml --- r: 284899 b: refs/heads/master c:
 f427984e896fde6ae03056cf1f8ac5d4a99275d4 h: refs/heads/master i:   284897:
 45c891044840303541ce4875e78af05a1a59870c   284895:
 b561464be5bb681591b667a056f4488411e317c8 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/video/omap2/dss/dispc.c | 3 +--
 trunk/drivers/video/omap2/dss/dss.h   | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e0df86ac2d47..8d18042b04ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b952b553d23912b0b4a496b3e695db5e60c7a99a
+refs/heads/master: f427984e896fde6ae03056cf1f8ac5d4a99275d4
diff --git a/trunk/drivers/video/omap2/dss/dispc.c b/trunk/drivers/video/omap2/dss/dispc.c
index 5bbd838a657a..5130f88516a0 100644
--- a/trunk/drivers/video/omap2/dss/dispc.c
+++ b/trunk/drivers/video/omap2/dss/dispc.c
@@ -875,8 +875,7 @@ static void dispc_ovl_set_color_mode(enum omap_plane plane,
 	REG_FLD_MOD(DISPC_OVL_ATTRIBUTES(plane), m, 4, 1);
 }
 
-static void dispc_ovl_set_channel_out(enum omap_plane plane,
-		enum omap_channel channel)
+void dispc_ovl_set_channel_out(enum omap_plane plane, enum omap_channel channel)
 {
 	int shift;
 	u32 val;
diff --git a/trunk/drivers/video/omap2/dss/dss.h b/trunk/drivers/video/omap2/dss/dss.h
index 7d2b6dd18e17..f899f0f6573e 100644
--- a/trunk/drivers/video/omap2/dss/dss.h
+++ b/trunk/drivers/video/omap2/dss/dss.h
@@ -402,6 +402,8 @@ int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
 		bool ilace, enum omap_channel channel, bool replication,
 		u32 fifo_low, u32 fifo_high);
 int dispc_ovl_enable(enum omap_plane plane, bool enable);
+void dispc_ovl_set_channel_out(enum omap_plane plane,
+		enum omap_channel channel);
 
 
 void dispc_mgr_enable_fifohandcheck(enum omap_channel channel, bool enable);