From bfba6ddb0026f6612a9896181c7800240db09be0 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Mon, 23 May 2011 16:36:09 +0300
Subject: [PATCH] --- yaml --- r: 261950 b: refs/heads/master c:
 4a9a5e390cb57f12de77b94b07dccf14752157ad h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/video/omap2/dss/dsi.c | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d3bbd7ab8f16..fe4d34043525 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24e6289c029b0cf5b4f75e12c1b66000d441c9ed
+refs/heads/master: 4a9a5e390cb57f12de77b94b07dccf14752157ad
diff --git a/trunk/drivers/video/omap2/dss/dsi.c b/trunk/drivers/video/omap2/dss/dsi.c
index 345757cfcbee..69c2d4fe0746 100644
--- a/trunk/drivers/video/omap2/dss/dsi.c
+++ b/trunk/drivers/video/omap2/dss/dsi.c
@@ -493,9 +493,18 @@ static void dsi_perf_show(struct platform_device *dsidev, const char *name)
 			total_bytes * 1000 / total_us);
 }
 #else
-#define dsi_perf_mark_setup(x)
-#define dsi_perf_mark_start(x)
-#define dsi_perf_show(x, y)
+static inline void dsi_perf_mark_setup(struct platform_device *dsidev)
+{
+}
+
+static inline void dsi_perf_mark_start(struct platform_device *dsidev)
+{
+}
+
+static inline void dsi_perf_show(struct platform_device *dsidev,
+		const char *name)
+{
+}
 #endif
 
 static void print_irq_status(u32 status)