Merge pull request torvalds#191 in PROCESSOR-SDK/processor-sdk-linux from plsdk-3113 to processor-sdk-linux-4.19.y

Jacob Stiffler · Jacob Stiffler · commit b2d07bb81a7c · 2019-10-31T11:47:37.000-05:00
* commit 'cf46e397a1b457ce2b31631a41b574fad9d0f4e7':
  clocksource: timer-ti-dm.c: fix merge error
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;
 

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ static int omap_dm_timer_is_enabled(struct omap_dm_timer *timer)`
`215`	`215`	`return 0;`
`216`	`216`	`}`
`217`	`217`
`218`		`-static void omap_dm_timer_enable(struct omap_dm_timer *timer)`
	`218`	`+void omap_dm_timer_enable(struct omap_dm_timer *timer)`
`219`	`219`	`{`
`220`	`220`	`int c;`
`221`	`221`