X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=lib_ppc%2Finterrupts.c;h=f6031707aeb1805f7f7ad5e253a5bc910b27e660;hb=2db3602fad9b0766997ae499c68533a66d87f189;hp=b803952badf2c88511d83dab960149959cc75d1b;hpb=d4ca31c40e8888b36635967522ec7ea03fd7e70b;p=u-boot

diff --git a/lib_ppc/interrupts.c b/lib_ppc/interrupts.c
index b803952bad..f6031707ae 100644
--- a/lib_ppc/interrupts.c
+++ b/lib_ppc/interrupts.c
@@ -32,11 +32,16 @@
 #endif
 
 #ifdef CONFIG_SHOW_ACTIVITY
-	extern void board_show_activity (ulong);
+void board_show_activity (ulong) __attribute__((weak, alias("__board_show_activity")));
+
+void __board_show_activity (ulong dummy)
+{
+	return;
+}
 #endif /* CONFIG_SHOW_ACTIVITY */
 
-#ifndef CFG_WATCHDOG_FREQ
-#define CFG_WATCHDOG_FREQ (CFG_HZ / 2)
+#ifndef CONFIG_SYS_WATCHDOG_FREQ
+#define CONFIG_SYS_WATCHDOG_FREQ (CONFIG_SYS_HZ / 2)
 #endif
 
 extern int interrupt_init_cpu (unsigned *);
@@ -119,7 +124,7 @@ void timer_interrupt (struct pt_regs *regs)
 	timestamp++;
 
 #if defined(CONFIG_WATCHDOG) || defined (CONFIG_HW_WATCHDOG)
-	if ((timestamp % (CFG_WATCHDOG_FREQ)) == 0)
+	if ((timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0)
 		WATCHDOG_RESET ();
 #endif    /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */