From mboxrd@z Thu Jan 1 00:00:00 1970 From: shawnguo@kernel.org (shawnguo at kernel.org) Date: Fri, 15 May 2015 16:11:47 +0800 Subject: [PATCH 9/9] ARM: imx: move timer driver into drivers/clocksource In-Reply-To: <1431677507-27420-1-git-send-email-shawnguo@kernel.org> References: <1431677507-27420-1-git-send-email-shawnguo@kernel.org> Message-ID: <1431677507-27420-10-git-send-email-shawnguo@kernel.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Shawn Guo After the cleanup on imx timer driver, now it's ready to be moved into drivers/clocksource/. Let's do it. Signed-off-by: Shawn Guo --- arch/arm/mach-imx/Makefile | 2 +- drivers/clocksource/Makefile | 1 + arch/arm/mach-imx/time.c => drivers/clocksource/timer-imx.c | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename arch/arm/mach-imx/time.c => drivers/clocksource/timer-imx.c (100%) diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 40df12af5036..0ac47955f3e1 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -1,4 +1,4 @@ -obj-y := time.o cpu.o system.o irq-common.o +obj-y := cpu.o system.o irq-common.o obj-$(CONFIG_SOC_IMX1) += mm-imx1.o obj-$(CONFIG_SOC_IMX21) += mm-imx21.o diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 5b85f6adb258..5c5a89479631 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -52,3 +52,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) += timer-integrator-ap.o obj-$(CONFIG_CLKSRC_VERSATILE) += versatile.o obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o obj-$(CONFIG_ASM9260_TIMER) += asm9260_timer.o +obj-$(CONFIG_ARCH_MXC) += timer-imx.o diff --git a/arch/arm/mach-imx/time.c b/drivers/clocksource/timer-imx.c similarity index 100% rename from arch/arm/mach-imx/time.c rename to drivers/clocksource/timer-imx.c -- 1.9.1