---

yaml --- r: 339934 b: refs/heads/master c: b0cadb3 h: refs/heads/master v: v3
git-mirror · Nov 16, 2012 · 95af770 · 95af770
1 parent f58a3c3
commit 95af770
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae6672cb47c8a7652e9aff182eb85a15994c9487
+refs/heads/master: b0cadb3c86fc99553b1f5c38c7770be1ad52aa26
diff --git a/trunk/arch/arm/plat-omap/dmtimer.c b/trunk/arch/arm/plat-omap/dmtimer.c
@@ -128,7 +128,7 @@ static int omap_dm_timer_reset(struct omap_dm_timer *timer)
 	return 0;
 }
 
-int omap_dm_timer_prepare(struct omap_dm_timer *timer)
+static int omap_dm_timer_prepare(struct omap_dm_timer *timer)
 {
 	int rc;
 

diff --git a/trunk/arch/arm/plat-omap/include/plat/dmtimer.h b/trunk/arch/arm/plat-omap/include/plat/dmtimer.h
@@ -286,8 +286,6 @@ struct omap_dm_timer {
 	struct list_head node;
 };
 
-int omap_dm_timer_prepare(struct omap_dm_timer *timer);
-
 static inline u32 __omap_dm_timer_read(struct omap_dm_timer *timer, u32 reg,
 						int posted)
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -128,7 +128,7 @@ static int omap_dm_timer_reset(struct omap_dm_timer *timer) @@
     	return 0;
     }
-    int omap_dm_timer_prepare(struct omap_dm_timer *timer)
+    static int omap_dm_timer_prepare(struct omap_dm_timer *timer)
     {
     	int rc;
@@ Expand Down @@