ARM: ICST: kill duplicate icst code
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 16 Jan 2010 20:16:10 +0000 (20:16 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 2 May 2010 08:35:33 +0000 (09:35 +0100)
commitc5a0adb51002e51a4254cb7f0ab7190d41d8b930
treeb6ae6bd13b1aa722e7d96876da28cd5ac3722188
parent232eaf7f268f765b52170bec42bfa0c5825aa239
ARM: ICST: kill duplicate icst code

The only difference between ICST307 and ICST525 are the two arrays
for calculating the S parameter; the code is now identical.  Merge
the two files and kill the duplicated code.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
20 files changed:
arch/arm/Kconfig
arch/arm/common/Kconfig
arch/arm/common/Makefile
arch/arm/common/icst.c [moved from arch/arm/common/icst307.c with 82% similarity]
arch/arm/common/icst525.c [deleted file]
arch/arm/include/asm/hardware/icst.h
arch/arm/include/asm/hardware/icst307.h [deleted file]
arch/arm/include/asm/hardware/icst525.h [deleted file]
arch/arm/mach-integrator/clock.c
arch/arm/mach-integrator/cpu.c
arch/arm/mach-integrator/impd1.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-realview/clock.c
arch/arm/mach-realview/core.c
arch/arm/mach-realview/realview_eb.c
arch/arm/mach-realview/realview_pb1176.c
arch/arm/mach-realview/realview_pb11mp.c
arch/arm/mach-realview/realview_pba8.c
arch/arm/mach-versatile/clock.c
arch/arm/mach-versatile/core.c