Reverse merge from trunk in pci_BaS_gcc branch

net/net_timer.c

@@ -24,8 +24,6 @@
 #include "firebee.h"
 #elif defined(MACHINE_M5484LITE)
 #include "m5484l.h"
-#elif defined(MACHINE_M54455)
-#include "m54455.h"
 #else
 #error unknown machine!
 #endif
@@ -154,7 +152,8 @@ bool timer_init(uint8_t ch, uint8_t lvl, uint8_t pri)
 	/*
 	 * Register the timer interrupt handler
 	 */
-	if (!isr_register_handler(TIMER_VECTOR(ch), 
+	if (!isr_register_handler(ISR_DBUG_ISR, 
+				TIMER_VECTOR(ch), 
 				(int (*)(void *,void *)) timer_default_isr,
 				NULL, 
 				(void *) &net_timer[ch])