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-realview/realview_pb11mp.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-realview/realview_pb11mp.c')
| -rw-r--r-- | arch/arm/mach-realview/realview_pb11mp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c index 3e02731af959..c7c656e235cc 100644 --- a/arch/arm/mach-realview/realview_pb11mp.c +++ b/arch/arm/mach-realview/realview_pb11mp.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <asm/leds.h> | 32 | #include <asm/leds.h> |
| 33 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
| 34 | #include <asm/hardware/gic.h> | 34 | #include <asm/hardware/gic.h> |
| 35 | #include <asm/hardware/icst307.h> | ||
| 36 | #include <asm/hardware/cache-l2x0.h> | 35 | #include <asm/hardware/cache-l2x0.h> |
| 37 | #include <asm/localtimer.h> | 36 | #include <asm/localtimer.h> |
| 38 | 37 | ||