From a1be5d649699e0eecfe5fc65130954435543cda4 Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 1 Mar 2012 15:35:50 +0000 Subject: [PATCH] ARM: riscpc: move time-acorn.c to mach-rpc Nothing but RiscPC makes use of the Acorn timekeeping code, so move it into mach-rpc. Signed-off-by: Russell King --- arch/arm/Kconfig | 1 - arch/arm/common/Kconfig | 3 --- arch/arm/common/Makefile | 1 - arch/arm/mach-rpc/Makefile | 2 +- arch/arm/{common/time-acorn.c => mach-rpc/time.c} | 0 5 files changed, 1 insertion(+), 6 deletions(-) rename arch/arm/{common/time-acorn.c => mach-rpc/time.c} (100%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a48aecc17eac..4b15d91fb81a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -731,7 +731,6 @@ config ARCH_RPC bool "RiscPC" select ARCH_ACORN select FIQ - select TIMER_ACORN select ARCH_MAY_HAVE_PC_FDC select HAVE_PATA_PLATFORM select ISA_DMA_API diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index 81a933eb0903..3bb1d7589bd9 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig @@ -35,9 +35,6 @@ config DMABOUNCE bool select ZONE_DMA -config TIMER_ACORN - bool - config SHARP_LOCOMO bool diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile index 6ea9b6f3607a..69feafe7286c 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile @@ -9,7 +9,6 @@ obj-$(CONFIG_PL330) += pl330.o obj-$(CONFIG_SA1111) += sa1111.o obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o obj-$(CONFIG_DMABOUNCE) += dmabounce.o -obj-$(CONFIG_TIMER_ACORN) += time-acorn.o obj-$(CONFIG_SHARP_LOCOMO) += locomo.o obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o obj-$(CONFIG_SHARP_SCOOP) += scoop.o diff --git a/arch/arm/mach-rpc/Makefile b/arch/arm/mach-rpc/Makefile index aa77bc9efbbb..69f2c0656966 100644 --- a/arch/arm/mach-rpc/Makefile +++ b/arch/arm/mach-rpc/Makefile @@ -4,7 +4,7 @@ # Object file lists. -obj-y := dma.o irq.o riscpc.o +obj-y := dma.o irq.o riscpc.o time.o obj-m := obj-n := obj- := diff --git a/arch/arm/common/time-acorn.c b/arch/arm/mach-rpc/time.c similarity index 100% rename from arch/arm/common/time-acorn.c rename to arch/arm/mach-rpc/time.c -- 2.20.1