diff options
author | Tom Rini <trini@konsulko.com> | 2016-05-17 13:58:27 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-05-17 13:58:27 -0400 |
commit | 4b6e1fda107e5244e80ebc41865650ac2873dc88 (patch) | |
tree | f448089740af77c2987d12e2dd5b753b7659586f /common/board_r.c | |
parent | 27bec5c12757c80f598b704477c1bc6c250bcb4c (diff) | |
parent | 341392dd115f1385c31bb0b034ec15f542730e30 (diff) | |
download | talos-obmc-uboot-4b6e1fda107e5244e80ebc41865650ac2873dc88.tar.gz talos-obmc-uboot-4b6e1fda107e5244e80ebc41865650ac2873dc88.zip |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'common/board_r.c')
-rw-r--r-- | common/board_r.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/board_r.c b/common/board_r.c index ad02549311..d959ad3c6f 100644 --- 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 |