diff options
| author | Barry Song <Baohua.Song@csr.com> | 2012-12-20 10:33:49 +0100 |
|---|---|---|
| committer | Barry Song <Barry.Song@csr.com> | 2013-01-22 12:38:24 +0100 |
| commit | 0d5983a62ad5749068a507e0c579af88f4753261 (patch) | |
| tree | 6931850f61dc121718e1de05ca438263c409696c /arch/arm/mach-prima2/Makefile | |
| parent | ARM: PRIMA2: initialize l2x0 according to mach from DT (diff) | |
| download | linux-0d5983a62ad5749068a507e0c579af88f4753261.tar.xz linux-0d5983a62ad5749068a507e0c579af88f4753261.zip | |
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/Makefile')
| -rw-r--r-- | arch/arm/mach-prima2/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-prima2/Makefile b/arch/arm/mach-prima2/Makefile index fc9ce22e2b5a..0007a6ec78f2 100644 --- a/arch/arm/mach-prima2/Makefile +++ b/arch/arm/mach-prima2/Makefile @@ -1,4 +1,3 @@ -obj-y := timer.o obj-y += rstc.o obj-y += common.o obj-y += rtciobrg.o @@ -6,3 +5,4 @@ obj-$(CONFIG_DEBUG_LL) += lluart.o obj-$(CONFIG_CACHE_L2X0) += l2x0.o obj-$(CONFIG_SUSPEND) += pm.o sleep.o obj-$(CONFIG_SIRF_IRQ) += irq.o +obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o |