From: Stelian Pop <stelian@popies.net>
Date: Wed, 26 Mar 2008 20:52:27 +0000 (+0100)
Subject: Use timer_init() instead of board supplied interrupt_init()
X-Git-Tag: v1.3.3-rc1~111^2~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=61106a565870ff503f92b251b94bd7afef889a04;p=u-boot

Use timer_init() instead of board supplied interrupt_init()

The timer on AT91CAP9/AT91SAM9 is supplied by the SoC, and not by
the board, so use timer_init() instead of interrupt_init().

Signed-off-by: Stelian Pop <stelian@popies.net>
---

diff --git a/cpu/arm926ejs/at91cap9/timer.c b/cpu/arm926ejs/at91cap9/timer.c
index 4110e15b5c..c6df5bd81b 100644
--- a/cpu/arm926ejs/at91cap9/timer.c
+++ b/cpu/arm926ejs/at91cap9/timer.c
@@ -41,7 +41,7 @@ ulong resettime;
 AT91PS_PITC p_pitc;
 
 /* nothing really to do with interrupts, just starts up a counter. */
-int interrupt_init(void)
+int timer_init(void)
 {
 	/*
 	 * Enable PITC Clock
diff --git a/cpu/arm926ejs/interrupts.c b/cpu/arm926ejs/interrupts.c
index 0971fea814..1819f6b078 100644
--- a/cpu/arm926ejs/interrupts.c
+++ b/cpu/arm926ejs/interrupts.c
@@ -38,7 +38,7 @@
 #include <common.h>
 #include <arm926ejs.h>
 
-#if defined(CONFIG_INTEGRATOR) || defined(CONFIG_AT91CAP9ADK)
+#ifdef CONFIG_INTEGRATOR
 
 	/* Timer functionality supplied by Integrator board (AP or CP) */