diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-16 20:16:10 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-02 09:35:33 +0100 |
commit | c5a0adb51002e51a4254cb7f0ab7190d41d8b930 (patch) | |
tree | b6ae6bd13b1aa722e7d96876da28cd5ac3722188 /arch/arm/common/Kconfig | |
parent | 232eaf7f268f765b52170bec42bfa0c5825aa239 (diff) |
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/Kconfig')
-rw-r--r-- | arch/arm/common/Kconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index 4efbb9df044..323d2d28952 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig @@ -12,10 +12,7 @@ config ARM_VIC_NR The maximum number of VICs available in the system, for power management. -config ICST525 - bool - -config ICST307 +config ICST bool config SA1111 |