diff options
| author | Haojian Zhuang <haojian.zhuang@gmail.com> | 2013-04-21 17:19:52 +0800 |
|---|---|---|
| committer | Haojian Zhuang <haojian.zhuang@gmail.com> | 2013-06-04 11:15:08 +0800 |
| commit | 55b37b1bf9976744c8ae7909921b04054dcbf294 (patch) | |
| tree | 5db501269d5f3751d575f49cb5cfad6cf9dc7961 | |
| parent | d63565dfbfd989fa1e048d507d554b0b4c2addf3 (diff) | |
clocksource: mmp: move mmp timer driver
Move timer-mmp driver from mach-mmp to clocksource directory.
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
| -rw-r--r-- | arch/arm/mach-mmp/Makefile | 2 | ||||
| -rw-r--r-- | drivers/clocksource/Makefile | 1 | ||||
| -rw-r--r-- | drivers/clocksource/timer-mmp.c (renamed from arch/arm/mach-mmp/time.c) | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-mmp/Makefile b/arch/arm/mach-mmp/Makefile index 9b702a1dc7b..5d4ccc6dc27 100644 --- a/arch/arm/mach-mmp/Makefile +++ b/arch/arm/mach-mmp/Makefile @@ -2,7 +2,7 @@ # Makefile for Marvell's PXA168 processors line # -obj-y += common.o devices.o time.o +obj-y += common.o devices.o # SoC support obj-$(CONFIG_CPU_PXA168) += pxa168.o diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 8d979c72aa9..f6aa3b68461 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -17,6 +17,7 @@ obj-$(CONFIG_CLKSRC_DBX500_PRCMU) += clksrc-dbx500-prcmu.o obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o obj-$(CONFIG_ARCH_MARCO) += timer-marco.o +obj-$(CONFIG_ARCH_MMP) += timer-mmp.o obj-$(CONFIG_ARCH_MXS) += mxs_timer.o obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o diff --git a/arch/arm/mach-mmp/time.c b/drivers/clocksource/timer-mmp.c index 86a18b3d252..553e3de45a9 100644 --- a/arch/arm/mach-mmp/time.c +++ b/drivers/clocksource/timer-mmp.c @@ -37,8 +37,6 @@ #include <mach/cputype.h> #include <asm/mach/time.h> -#include "clock.h" - #define TIMERS_VIRT_BASE TIMERS1_VIRT_BASE #define MAX_DELTA (0xfffffffe) |