Skip to content

Commit

Permalink
ARM: riscpc: move time-acorn.c to mach-rpc
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Russell King committed Mar 24, 2012
1 parent d65b4e9 commit a1be5d6
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 6 deletions.
1 change: 0 additions & 1 deletion arch/arm/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions arch/arm/common/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ config DMABOUNCE
bool
select ZONE_DMA

config TIMER_ACORN
bool

config SHARP_LOCOMO
bool

Expand Down
1 change: 0 additions & 1 deletion arch/arm/common/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-rpc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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- :=
Expand Down
0 arch/arm/common/time-acorn.c → arch/arm/mach-rpc/time.c
View file
File renamed without changes.

0 comments on commit a1be5d6

Please sign in to comment.