diff options
| author | Barry Song <Baohua.Song@csr.com> | 2012-12-20 17:33:49 +0800 |
|---|---|---|
| committer | Barry Song <Barry.Song@csr.com> | 2013-01-22 19:38:24 +0800 |
| commit | 0d5983a62ad5749068a507e0c579af88f4753261 (patch) | |
| tree | 6931850f61dc121718e1de05ca438263c409696c /arch/arm/mach-prima2/common.h | |
| parent | ea38960fb63ab5cce2442fa88f5041bcfb1ae8e3 (diff) | |
| download | linux-0d5983a62ad5749068a507e0c579af88f4753261.tar.bz2 | |
ARM: PRIMA2: mv timer to timer-prima2 as we will add timer-marco
Marco timer has different timer IP with prima2, so rename the current timer
to timer-prima2 so that we can add timer-marco.
at the same time, if we don't find prima2 timer node in dt, don't panic the
system as we will make prima2 and marco use same kernel image.
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Diffstat (limited to 'arch/arm/mach-prima2/common.h')
| -rw-r--r-- | arch/arm/mach-prima2/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-prima2/common.h b/arch/arm/mach-prima2/common.h index 9c75f124e3cf..d6890b6833c9 100644 --- a/arch/arm/mach-prima2/common.h +++ b/arch/arm/mach-prima2/common.h @@ -12,7 +12,7 @@ #include <linux/init.h> #include <asm/mach/time.h> -extern void sirfsoc_timer_init(void); +extern void sirfsoc_prima2_timer_init(void); extern void __init sirfsoc_of_irq_init(void); extern void __init sirfsoc_of_clk_init(void); |