Merge branch 'master' of git://git.denx.de/u-boot-i2c

[people/ms/u-boot.git] / common / board_f.c

diff --git a/common/board_f.c b/common/board_f.c
index eed3e7be2a17b8853780eb986765fd153d01495b..a212f2b53921356f730c4bd28d8515b2182385b2 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -740,7 +740,9 @@ static const init_fnc_t init_sequence_f[] = {
        /* get CPU and bus clocks according to the environment variable */
        get_clocks,             /* get CPU and bus clocks (etc.) */
 #endif
+#if !defined(CONFIG_M68K)
        timer_init,             /* initialize timer */
+#endif
 #if defined(CONFIG_BOARD_POSTCLK_INIT)
        board_postclk_init,
 #endif