diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-06-26 13:30:32 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-06-26 13:30:35 +1000 |
| commit | c67baa8dff3ac02c649494f7de44f0b7da17ba86 (patch) | |
| tree | fc3829f19ded6978f48a3f0c5fd724a0ea478c3d /drivers/clocksource/timer-sp804.c | |
| parent | 35ee938fd92e3eb06ef8c0357f9faaba71a2910a (diff) | |
| parent | de98cec5be7503cb04d430d5b3fae8419aa42473 (diff) | |
| download | linux-next-c67baa8dff3ac02c649494f7de44f0b7da17ba86.tar.gz | |
Merge remote-tracking branch 'tip/auto-latest'
Diffstat (limited to 'drivers/clocksource/timer-sp804.c')
| -rw-r--r-- | drivers/clocksource/timer-sp804.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c index 2d575a8c0939..3ac9dec9a038 100644 --- a/drivers/clocksource/timer-sp804.c +++ b/drivers/clocksource/timer-sp804.c @@ -287,7 +287,7 @@ err: iounmap(base); return ret; } -CLOCKSOURCE_OF_DECLARE(sp804, "arm,sp804", sp804_of_init); +TIMER_OF_DECLARE(sp804, "arm,sp804", sp804_of_init); static int __init integrator_cp_of_init(struct device_node *np) { @@ -335,4 +335,4 @@ err: iounmap(base); return ret; } -CLOCKSOURCE_OF_DECLARE(intcp, "arm,integrator-cp-timer", integrator_cp_of_init); +TIMER_OF_DECLARE(intcp, "arm,integrator-cp-timer", integrator_cp_of_init); |