Merge branch 'master' of git://git.denx.de/u-boot-arm into HEAD

[karo-tx-uboot.git] / common / board_r.c

diff --git a/common/board_r.c b/common/board_r.c
index 63c69365b19733ed53a29ef71c370a644e03087a..2b17fa6cfedef6db677d1931dfe6ca7af2f5f769 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -507,11 +507,13 @@ static int show_model_r(void)
 #endif
 
 /* enable exceptions */
+#ifdef CONFIG_ARM
 static int initr_enable_interrupts(void)
 {
        enable_interrupts();
        return 0;
 }
+#endif
 
 #ifdef CONFIG_CMD_NET
 static int initr_ethaddr(void)
@@ -719,9 +721,6 @@ init_fnc_t init_sequence_r[] = {
         */
 #ifdef CONFIG_CLOCKS
        set_cpu_clk_info, /* Setup clock information */
-#endif
-#ifdef CONFIG_X86
-       init_bd_struct_r,
 #endif
        initr_reloc_global_data,
        initr_serial,