Merge branch 'next' of ../next

[platform/kernel/u-boot.git] / cpu / arm920t / s3c24x0 / interrupts.c

diff --git a/cpu/arm920t/s3c24x0/interrupts.c b/cpu/arm920t/s3c24x0/interrupts.c
index 11ec95e..879fda6 100644 (file)
--- a/cpu/arm920t/s3c24x0/interrupts.c
+++ b/cpu/arm920t/s3c24x0/interrupts.c
@@ -31,16 +31,12 @@
 
 #include <common.h>
 
-#if defined(CONFIG_S3C2400)
-#include <s3c2400.h>
-#elif defined(CONFIG_S3C2410)
-#include <s3c2410.h>
-#endif
+#include <asm/arch/s3c24x0_cpu.h>
 #include <asm/proc-armv/ptrace.h>
 
 void do_irq (struct pt_regs *pt_regs)
 {
-       S3C24X0_INTERRUPT * irq = S3C24X0_GetBase_INTERRUPT();
-       u_int32_t intpnd = irq->INTPND;
+       struct s3c24x0_interrupt *irq = s3c24x0_get_base_interrupt();
+       u_int32_t intpnd = readl(&irq->INTPND);
 
 }