summaryrefslogtreecommitdiffstats
path: root/cpu/sa1100
diff options
context:
space:
mode:
Diffstat (limited to 'cpu/sa1100')
-rw-r--r--cpu/sa1100/Makefile4
-rw-r--r--cpu/sa1100/timer.c (renamed from cpu/sa1100/interrupts.c)5
2 files changed, 5 insertions, 4 deletions
diff --git a/cpu/sa1100/Makefile b/cpu/sa1100/Makefile
index fd696f7efb..28b668267c 100644
--- a/cpu/sa1100/Makefile
+++ b/cpu/sa1100/Makefile
@@ -26,7 +26,9 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(CPU).a
START = start.o
-COBJS = interrupts.o cpu.o
+
+COBJS += cpu.o
+COBJS += timer.o
SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/cpu/sa1100/interrupts.c b/cpu/sa1100/timer.c
index 2eff045709..3f77e815cb 100644
--- a/cpu/sa1100/interrupts.c
+++ b/cpu/sa1100/timer.c
@@ -29,10 +29,9 @@
#include <common.h>
#include <SA-1100.h>
-int interrupt_init (void)
+int timer_init (void)
{
- /* nothing happens here - we don't setup any IRQs */
- return (0);
+ return 0;
}
void reset_timer (void)
OpenPOWER on IntegriCloud