aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mmp
diff options
context:
space:
mode:
authorChao Xie <chao.xie@marvell.com>2012-08-27 10:53:59 +0800
committerHaojian Zhuang <haojian.zhuang@gmail.com>2012-09-08 23:36:44 +0800
commit699c9d30bc3de2224b1d2fecec5303b7f754058d (patch)
tree6a63c8e7c679cb6f082575adee055c768276d121 /arch/arm/mach-mmp
parent4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (diff)
arm: mmp: make private clock definition exclude from common clock
the clock.c is mmp private implementation, make it excluded from common clock framework Signed-off-by: Chao Xie <xiechao.mail@gmail.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'arch/arm/mach-mmp')
-rw-r--r--arch/arm/mach-mmp/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/Makefile b/arch/arm/mach-mmp/Makefile
index b786f7e6cd1..815c3e74c24 100644
--- a/arch/arm/mach-mmp/Makefile
+++ b/arch/arm/mach-mmp/Makefile
@@ -2,13 +2,16 @@
# Makefile for Marvell's PXA168 processors line
#
-obj-y += common.o clock.o devices.o time.o irq.o
+obj-y += common.o devices.o time.o irq.o
# SoC support
obj-$(CONFIG_CPU_PXA168) += pxa168.o
obj-$(CONFIG_CPU_PXA910) += pxa910.o
obj-$(CONFIG_CPU_MMP2) += mmp2.o sram.o
+ifeq ($(CONFIG_COMMON_CLK), )
+obj-y += clock.o
+endif
ifeq ($(CONFIG_PM),y)
obj-$(CONFIG_CPU_PXA910) += pm-pxa910.o
obj-$(CONFIG_CPU_MMP2) += pm-mmp2.o