Merge pull request torvalds#191 in PROCESSOR-SDK/processor-sdk-linux …

…from plsdk-3113 to processor-sdk-linux-4.19.y * commit 'cf46e397a1b457ce2b31631a41b574fad9d0f4e7': clocksource: timer-ti-dm.c: fix merge error
chombourger · Oct 31, 2019 · b2d07bb · b2d07bb
2 parents 08a0df6 + cf46e39
commit b2d07bb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c
@@ -215,7 +215,7 @@ static int omap_dm_timer_is_enabled(struct omap_dm_timer *timer)
 		return 0;
 }
 
-static void omap_dm_timer_enable(struct omap_dm_timer *timer)
+void omap_dm_timer_enable(struct omap_dm_timer *timer)
 {
 	int c;