diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-04 19:50:07 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-04 19:50:07 +0300 |
| commit | f4845bd61300c2b5013bd4fa28c83975a85069bc (patch) | |
| tree | 974925d5ec1d615a748d37dab2e41c823e38f5c5 /drivers/clocksource/samsung_pwm_timer.c | |
| parent | 3985b18650bf2365debb142624f877007b31ada2 (diff) | |
| parent | a852cc89cffb65272be77785b9eb2682e38ed53f (diff) | |
Merge branch 'tracking-ilp32' into merge-linux-linaro-extralinux-linaro-extra-20151104.0linux-linaro-extra
Diffstat (limited to 'drivers/clocksource/samsung_pwm_timer.c')
| -rw-r--r-- | drivers/clocksource/samsung_pwm_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c index bc90e13338cc..9502bc4c3f6d 100644 --- a/drivers/clocksource/samsung_pwm_timer.c +++ b/drivers/clocksource/samsung_pwm_timer.c @@ -307,7 +307,7 @@ static void samsung_clocksource_resume(struct clocksource *cs) samsung_time_start(pwm.source_id, true); } -static cycle_t samsung_clocksource_read(struct clocksource *c) +static cycle_t notrace samsung_clocksource_read(struct clocksource *c) { return ~readl_relaxed(pwm.source_reg); } |