Просмотр исходного кода

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>
Russell King 13 лет назад
Родитель
Сommit
a1be5d6496
5 измененных файлов с 1 добавлено и 6 удалено
  1. 0 1
      arch/arm/Kconfig
  2. 0 3
      arch/arm/common/Kconfig
  3. 0 1
      arch/arm/common/Makefile
  4. 1 1
      arch/arm/mach-rpc/Makefile
  5. 0 0
      arch/arm/mach-rpc/time.c

+ 0 - 1
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

+ 0 - 3
arch/arm/common/Kconfig

@@ -35,9 +35,6 @@ config DMABOUNCE
 	bool
 	select ZONE_DMA
 
-config TIMER_ACORN
-	bool
-
 config SHARP_LOCOMO
 	bool
 

+ 0 - 1
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

+ 1 - 1
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-			:=

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