2 files changed, 5 insertions, 9 deletions
diff --git a/boards/OLIMEX_MSP430_P1611/board.c b/boards/OLIMEX_MSP430_P1611/board.c
index 072b1dd5a..558110376 100644
--- a/boards/OLIMEX_MSP430_P1611/board.c
+++ b/boards/OLIMEX_MSP430_P1611/board.c
@@ -61,15 +61,9 @@ CH_IRQ_HANDLER(TIMERA0_VECTOR) {
 }
 
 /*
- * Hardware initialization goes here.
- * NOTE: Interrupts are still disabled.
+ * Board-specific initialization code.
  */
-void hwinit(void) {
-
-  /*
-   * HAL initialization.
-   */
-  halInit();
+void boardInit(void) {
 
   /*
    * Timer 0 setup, uses SMCLK as source.
diff --git a/boards/OLIMEX_MSP430_P1611/board.h b/boards/OLIMEX_MSP430_P1611/board.h
index 34d625994..c445c5b6e 100644
--- a/boards/OLIMEX_MSP430_P1611/board.h
+++ b/boards/OLIMEX_MSP430_P1611/board.h
@@ -70,12 +70,14 @@
 #define VAL_P6OUT       P6_O_LED_MASK
 #define VAL_P6DIR       ~P6_I_BUTTON_MASK
 
+#if !defined(_FROM_ASM_)
 #ifdef __cplusplus
 extern "C" {
 #endif
-  void hwinit(void);
+  void boardInit(void);
 #ifdef __cplusplus
 }
 #endif
+#endif /* _FROM_ASM_ */
 
 #endif /* _BOARD_H_ */