diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-06-14 22:05:42 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-06-14 22:05:42 +0200 |
| commit | 92afd368bba7d98b2b7bfb51082c3639bb2119b3 (patch) | |
| tree | 74ffc8a3f4980f7c6bad6bf80bb41d3974eff685 /cpu/arm920t/s3c24x0 | |
| parent | 6b1f78ae6ad037382ad430b07064105c88f7ac02 (diff) | |
| parent | 388517e4b745b00256c2fa201ce7bccb67b4f245 (diff) | |
Merge branch 'next' of ../master
Diffstat (limited to 'cpu/arm920t/s3c24x0')
| -rw-r--r-- | cpu/arm920t/s3c24x0/Makefile | 5 | ||||
| -rw-r--r-- | cpu/arm920t/s3c24x0/timer.c (renamed from cpu/arm920t/s3c24x0/interrupts.c) | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/cpu/arm920t/s3c24x0/Makefile b/cpu/arm920t/s3c24x0/Makefile index 3afe19ce9c..5d2be2c1b2 100644 --- a/cpu/arm920t/s3c24x0/Makefile +++ b/cpu/arm920t/s3c24x0/Makefile @@ -25,7 +25,10 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).a -COBJS = interrupts.o speed.o usb.o usb_ohci.o +COBJS += speed.o +COBJS += timer.o +COBJS += usb.o +COBJS += usb_ohci.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/cpu/arm920t/s3c24x0/interrupts.c b/cpu/arm920t/s3c24x0/timer.c index b8ce6ae94a..f0a09cddff 100644 --- a/cpu/arm920t/s3c24x0/interrupts.c +++ b/cpu/arm920t/s3c24x0/timer.c @@ -32,7 +32,6 @@ #include <common.h> #if defined(CONFIG_S3C2400) || defined (CONFIG_S3C2410) || defined (CONFIG_TRAB) -#include <arm920t.h> #if defined(CONFIG_S3C2400) #include <s3c2400.h> #elif defined(CONFIG_S3C2410) @@ -52,7 +51,7 @@ static inline ulong READ_TIMER(void) static ulong timestamp; static ulong lastdec; -int interrupt_init (void) +int timer_init (void) { S3C24X0_TIMERS * const timers = S3C24X0_GetBase_TIMERS(); |