Revert "Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze"
This reverts commit 3edc0c252257e4afed163a3a74aba24a5509b198, reversing
changes made to bb135a0180c31fbd7456021fb9700b49bba7f533.
diff --git a/common/board_r.c b/common/board_r.c
index a373352..5496f45 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -620,7 +620,7 @@
}
#endif
-#if defined(CONFIG_SCSI) && !defined(CONFIG_DM_SCSI)
+#if defined(CONFIG_SCSI)
static int initr_scsi(void)
{
puts("SCSI: ");
@@ -923,7 +923,7 @@
initr_ambapp_print,
#endif
#endif
-#if defined(CONFIG_SCSI) && !defined(CONFIG_DM_SCSI)
+#ifdef CONFIG_SCSI
INIT_FUNC_WATCHDOG_RESET
initr_scsi,
#endif