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/Kconfig | |
| parent | 232eaf7f268f765b52170bec42bfa0c5825aa239 (diff) | |
| download | lwn-c5a0adb51002e51a4254cb7f0ab7190d41d8b930.tar.gz lwn-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/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 86fecec1600d..3c436fdbe2a0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -240,7 +240,7 @@ config ARCH_INTEGRATOR select ARCH_HAS_CPUFREQ select HAVE_CLK select COMMON_CLKDEV - select ICST525 + select ICST select GENERIC_TIME select GENERIC_CLOCKEVENTS help @@ -251,7 +251,7 @@ config ARCH_REALVIEW select ARM_AMBA select HAVE_CLK select COMMON_CLKDEV - select ICST307 + select ICST select GENERIC_TIME select GENERIC_CLOCKEVENTS select ARCH_WANT_OPTIONAL_GPIOLIB @@ -264,7 +264,7 @@ config ARCH_VERSATILE select ARM_VIC select HAVE_CLK select COMMON_CLKDEV - select ICST307 + select ICST select GENERIC_TIME select GENERIC_CLOCKEVENTS select ARCH_WANT_OPTIONAL_GPIOLIB |