projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
[platform/kernel/u-boot.git]
/
common
/
board_r.c
diff --git
a/common/board_r.c
b/common/board_r.c
index
ad02549
..
d959ad3
100644
(file)
--- a/
common/board_r.c
+++ b/
common/board_r.c
@@
-620,7
+620,7
@@
static int initr_ambapp_print(void)
}
#endif
-#if defined(CONFIG_
CMD_
SCSI)
+#if defined(CONFIG_SCSI)
static int initr_scsi(void)
{
puts("SCSI: ");
@@
-923,7
+923,7
@@
init_fnc_t init_sequence_r[] = {
initr_ambapp_print,
#endif
#endif
-#ifdef CONFIG_
CMD_
SCSI
+#ifdef CONFIG_SCSI
INIT_FUNC_WATCHDOG_RESET
initr_scsi,
#endif