Merge with http://opensource.freescale.com/pub/scm/u-boot-85xx.git#for_wd

[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 ba835f3..1b36412 100644 (file)
--- a/cpu/arm920t/s3c24x0/interrupts.c
+++ b/cpu/arm920t/s3c24x0/interrupts.c
@@ -176,7 +176,9 @@ ulong get_tbclk (void)
 
 #if defined(CONFIG_SMDK2400) || defined(CONFIG_TRAB)
        tbclk = timer_load_val * 100;
-#elif defined(CONFIG_SMDK2410) || defined(CONFIG_VCMA9)
+#elif defined(CONFIG_SBC2410X) || \
+      defined(CONFIG_SMDK2410) || \
+      defined(CONFIG_VCMA9)
        tbclk = CFG_HZ;
 #else
 #      error "tbclk not configured"
@@ -190,9 +192,11 @@ ulong get_tbclk (void)
  */
 void reset_cpu (ulong ignored)
 {
-       S3C24X0_WATCHDOG * const watchdog;
+       volatile S3C24X0_WATCHDOG * watchdog;
 
 #ifdef CONFIG_TRAB
+       extern void disable_vfd (void);
+
        disable_vfd();
 #endif