Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1be5d64 authored Mar 01, 2012 by Russell King

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 <rmk+kernel@arm.linux.org.uk>

parent d65b4e98

arch/arm/Kconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -731,7 +731,6 @@ config ARCH_RPC
	bool "RiscPC"		bool "RiscPC"
	select ARCH_ACORN		select ARCH_ACORN
	select FIQ		select FIQ
	select TIMER_ACORN
	select ARCH_MAY_HAVE_PC_FDC		select ARCH_MAY_HAVE_PC_FDC
	select HAVE_PATA_PLATFORM		select HAVE_PATA_PLATFORM
	select ISA_DMA_API		select ISA_DMA_API

arch/arm/common/Kconfig

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -35,9 +35,6 @@ config DMABOUNCE
	bool		bool
	select ZONE_DMA		select ZONE_DMA

	config TIMER_ACORN
	bool

	config SHARP_LOCOMO		config SHARP_LOCOMO
	bool		bool

arch/arm/common/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,6 @@ obj-$(CONFIG_PL330) += pl330.o
	obj-$(CONFIG_SA1111) += sa1111.o		obj-$(CONFIG_SA1111) += sa1111.o
	obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o		obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o
	obj-$(CONFIG_DMABOUNCE) += dmabounce.o		obj-$(CONFIG_DMABOUNCE) += dmabounce.o
	obj-$(CONFIG_TIMER_ACORN) += time-acorn.o
	obj-$(CONFIG_SHARP_LOCOMO) += locomo.o		obj-$(CONFIG_SHARP_LOCOMO) += locomo.o
	obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o		obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o
	obj-$(CONFIG_SHARP_SCOOP) += scoop.o		obj-$(CONFIG_SHARP_SCOOP) += scoop.o

arch/arm/mach-rpc/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,7 +4,7 @@

	# Object file lists.		# Object file lists.

	obj-y := dma.o irq.o riscpc.o		obj-y := dma.o irq.o riscpc.o time.o
	obj-m :=		obj-m :=
	obj-n :=		obj-n :=
	obj- :=		obj- :=

arch/arm/common/time-acorn.c→arch/arm/mach-rpc/time.c

+0 −0

File moved.