Merge with /home/sr/git/u-boot/cfi-flash

[platform/kernel/u-boot.git] / disk / part_amiga.c

diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index f1ad24a..41e68fc 100644 (file)
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -24,10 +24,13 @@
 #include <common.h>
 #include <command.h>
 #include <ide.h>
-#include <cmd_disk.h>
 #include "part_amiga.h"
 
-#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)) && defined(CONFIG_AMIGA_PARTITION)
+#if ((CONFIG_COMMANDS & CFG_CMD_IDE)   || \
+     (CONFIG_COMMANDS & CFG_CMD_SCSI)  || \
+     (CONFIG_COMMANDS & CFG_CMD_USB)   || \
+     defined(CONFIG_MMC) || \
+     defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_AMIGA_PARTITION)
 
 #undef AMIGA_DEBUG