diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-09 07:10:39 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-09 07:10:39 -0500 |
| commit | 3edc0c252257e4afed163a3a74aba24a5509b198 (patch) | |
| tree | de01174e841e19844a158569113c559993764248 /common/board_r.c | |
| parent | bb135a0180c31fbd7456021fb9700b49bba7f533 (diff) | |
| parent | b63cb3abbc626dc918828f302bd8ea72e7c226d2 (diff) | |
| download | u-boot-3edc0c252257e4afed163a3a74aba24a5509b198.tar.gz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
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 5496f45cbd..a3733526c6 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_SCSI) +#if defined(CONFIG_SCSI) && !defined(CONFIG_DM_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_SCSI +#if defined(CONFIG_SCSI) && !defined(CONFIG_DM_SCSI) INIT_FUNC_WATCHDOG_RESET initr_scsi, #endif |