From 61106a565870ff503f92b251b94bd7afef889a04 Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Wed, 26 Mar 2008 21:52:27 +0100 Subject: 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 --- cpu/arm926ejs/at91cap9/timer.c | 2 +- cpu/arm926ejs/interrupts.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpu/arm926ejs/at91cap9/timer.c b/cpu/arm926ejs/at91cap9/timer.c index 4110e15..c6df5bd 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 0971fea..1819f6b 100644 --- a/cpu/arm926ejs/interrupts.c +++ b/cpu/arm926ejs/interrupts.c @@ -38,7 +38,7 @@ #include #include -#if defined(CONFIG_INTEGRATOR) || defined(CONFIG_AT91CAP9ADK) +#ifdef CONFIG_INTEGRATOR /* Timer functionality supplied by Integrator board (AP or CP) */ -- cgit v1.1