diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-30 10:07:08 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-30 10:07:08 +0200 |
| commit | b2b15ebb66f0e7958dff8916077da0aceb2982a8 (patch) | |
| tree | 33ad7fe298698b4b59d53751b6b050e7e86dea34 /lib_sparc | |
| parent | b8ec9fb736abd99bff071bdf809951ea1b8a5dff (diff) | |
| parent | 5c374c9ee16fee2bf68533cc4010b3c0df21f783 (diff) | |
Merge branch 'hammerhead' of git://git.denx.de/u-boot-avr32
Diffstat (limited to 'lib_sparc')
| -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 af301c046e1..205a8ca5327 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(); |