diff options
author | Markus Klotzbuecher <mk@denx.de> | 2008-08-04 19:18:14 +0200 |
---|---|---|
committer | Markus Klotzbuecher <mk@denx.de> | 2008-08-04 19:18:14 +0200 |
commit | 0f2b5d8ec0969a5b0992f5031bf3c61117a41d59 (patch) | |
tree | fc05bf5db93e5a9c1712d24a5efdff94685063c2 /lib_sparc/board.c | |
parent | ab06bddb04ed4be50a8f9ad5f94fa23953a734e3 (diff) | |
parent | 81091f58f0c58ecd26c5b05de2ae20ca6cdb521c (diff) |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'lib_sparc/board.c')
-rw-r--r-- | lib_sparc/board.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib_sparc/board.c b/lib_sparc/board.c index af301c046e..205a8ca532 100644 --- 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(); |