From 96782c63d3bd4067623895b8691ed2823c715f1d Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@pollux.denx.de>
Date: Sun, 9 Oct 2005 00:22:48 +0200
Subject: Cleanup warnings for cpu/arm720t & cpu/arm1136 files. sed the linker
 scripts, rather than pre-process them. Patch by Peter Pearse, 07 Oct 2005

---
 cpu/arm1136/cpu.c        | 2 ++
 cpu/arm1136/interrupts.c | 9 +++++----
 cpu/arm1136/start.S      | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'cpu/arm1136')

diff --git a/cpu/arm1136/cpu.c b/cpu/arm1136/cpu.c
index 7fa5ddcac..85a48491b 100644
--- a/cpu/arm1136/cpu.c
+++ b/cpu/arm1136/cpu.c
@@ -33,7 +33,9 @@
 
 #include <common.h>
 #include <command.h>
+#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
 #include <asm/arch/omap2420.h>
+#endif
 
 /* read co-processor 15, register #1 (control register) */
 static unsigned long read_p15_c1 (void)
diff --git a/cpu/arm1136/interrupts.c b/cpu/arm1136/interrupts.c
index 6b1449e97..1dc36d034 100644
--- a/cpu/arm1136/interrupts.c
+++ b/cpu/arm1136/interrupts.c
@@ -33,7 +33,7 @@
 #include <common.h>
 #include <asm/arch/bits.h>
 
-#if !defined(CONFIG_INTEGRATOR) || ! defined(CONFIG_ARCH_CINTEGRATOR)
+#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
 # include <asm/arch/omap2420.h>
 #endif
 
@@ -176,12 +176,13 @@ void do_irq (struct pt_regs *pt_regs)
 	bad_mode ();
 }
 
-static ulong timestamp;
-static ulong lastinc;
-
 #if defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_CINTEGRATOR)
 /* Use the IntegratorCP function from board/integratorcp.c */
 #else
+
+static ulong timestamp;
+static ulong lastinc;
+
 /* nothing really to do with interrupts, just starts up a counter. */
 int interrupt_init (void)
 {
diff --git a/cpu/arm1136/start.S b/cpu/arm1136/start.S
index 05c9128d8..17c7a8349 100644
--- a/cpu/arm1136/start.S
+++ b/cpu/arm1136/start.S
@@ -30,8 +30,9 @@
 
 #include <config.h>
 #include <version.h>
+#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
 #include <asm/arch/omap2420.h>
-
+#endif
 .globl _start
 _start: b	reset
 	ldr	pc, _undefined_instruction
-- 
cgit v1.2.3