Explorar o código

Merge pull request #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
Jacob Stiffler %!s(int64=6) %!d(string=hai) anos
pai
achega
b2d07bb81a
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      drivers/clocksource/timer-ti-dm.c

+ 1 - 1
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;