diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-16 15:16:10 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-02 04:35:33 -0400 |
| commit | c5a0adb51002e51a4254cb7f0ab7190d41d8b930 (patch) | |
| tree | b6ae6bd13b1aa722e7d96876da28cd5ac3722188 /arch/arm/mach-integrator/impd1.c | |
| 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/mach-integrator/impd1.c')
| -rw-r--r-- | arch/arm/mach-integrator/impd1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index e24cfc357ffb..3e2110216851 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #include <asm/clkdev.h> | 25 | #include <asm/clkdev.h> |
| 26 | #include <mach/clkdev.h> | 26 | #include <mach/clkdev.h> |
| 27 | #include <asm/hardware/icst525.h> | 27 | #include <asm/hardware/icst.h> |
| 28 | #include <mach/lm.h> | 28 | #include <mach/lm.h> |
| 29 | #include <mach/impd1.h> | 29 | #include <mach/impd1.h> |
| 30 | #include <asm/sizes.h> | 30 | #include <asm/sizes.h> |