Fix merge problems

[karo-tx-uboot.git] / lib_sparc / board.c

diff --git a/lib_sparc/board.c b/lib_sparc/board.c
index af301c046e1c1b65ee28ad23ab4ae03ba9ce8274..205a8ca5327b0e1309d3b7603903640d92e363b6 100644 (file)
--- a/lib_sparc/board.c
+++ b/lib_sparc/board.c
@@ -451,7 +451,7 @@ void board_init_f(ulong bootflag)
        if ((s = getenv("bootfile")) != NULL) {
                copy_filename(BootFile, s, sizeof(BootFile));
        }
-#endif                         /* CFG_CMD_NET */
+#endif /* CONFIG_CMD_NET */
 
        WATCHDOG_RESET();
 
@@ -483,7 +483,7 @@ void board_init_f(ulong bootflag)
        WATCHDOG_RESET();
        puts("IDE:   ");
        ide_init();
-#endif                         /* CFG_CMD_IDE */
+#endif /* CONFIG_CMD_IDE */
 
 #ifdef CONFIG_LAST_STAGE_INIT
        WATCHDOG_RESET();