aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/common/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-01-16 20:16:10 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-02 09:35:33 +0100
commitc5a0adb51002e51a4254cb7f0ab7190d41d8b930 (patch)
treeb6ae6bd13b1aa722e7d96876da28cd5ac3722188 /arch/arm/common/Makefile
parentARM: ICST: indirect s2div and idx2s arrays via icst_params (diff)
downloadlinux-dev-c5a0adb51002e51a4254cb7f0ab7190d41d8b930.tar.xz
linux-dev-c5a0adb51002e51a4254cb7f0ab7190d41d8b930.zip
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>
Diffstat (limited to 'arch/arm/common/Makefile')
-rw-r--r--arch/arm/common/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
index 76be7ff2a7ca..5e8ad0d6c917 100644
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@ -4,8 +4,7 @@
obj-$(CONFIG_ARM_GIC) += gic.o
obj-$(CONFIG_ARM_VIC) += vic.o
-obj-$(CONFIG_ICST525) += icst525.o
-obj-$(CONFIG_ICST307) += icst307.o
+obj-$(CONFIG_ICST) += icst.o
obj-$(CONFIG_SA1111) += sa1111.o
obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o
obj-$(CONFIG_DMABOUNCE) += dmabounce.o