diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-17 23:33:22 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-17 23:33:22 +0200 |
| commit | a89e14edd296f1772bb93b7165cb03f29d11e4b3 (patch) | |
| tree | cb639b9fbdc85d314facf765afde2be0da34aade /arch/arm/mach-ux500/timer.c | |
| parent | 5d74c8a065abc8ae283a6fe8a1e7dd6313a22165 (diff) | |
| parent | 2b667a2d8005e7c8362a77365cedbcd71fa5d6c1 (diff) | |
Merge branch 'ux500/fixes-3.5' into next/dt
prerequisite for ux500/dt branch
Diffstat (limited to 'arch/arm/mach-ux500/timer.c')
| -rw-r--r-- | arch/arm/mach-ux500/timer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index 741e71feca78..66e7f00884ab 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c @@ -63,8 +63,10 @@ static void __init ux500_timer_init(void) /* TODO: Once MTU has been DT:ed place code above into else. */ if (of_have_populated_dt()) { +#ifdef CONFIG_OF np = of_find_matching_node(NULL, prcmu_timer_of_match); if (!np) +#endif goto dt_fail; tmp_base = of_iomap(np, 0); |