X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=disk%2Fpart.c;h=76f393900a50b452b9f7afa59a43f3e896fa90cc;hb=0463574014e28985112d4ea77eaab03d5a340295;hp=f07a17feb8a0e5e03663d986754e346779efe0ad;hpb=f16b608ae7d0c4611d3a41d2570616a498e64d4c;p=u-boot

diff --git a/disk/part.c b/disk/part.c
index f07a17feb8..76f393900a 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -35,7 +35,6 @@
 #endif
 
 #if (defined(CONFIG_CMD_IDE) || \
-     defined(CONFIG_CMD_MG_DISK) || \
      defined(CONFIG_CMD_SATA) || \
      defined(CONFIG_CMD_SCSI) || \
      defined(CONFIG_CMD_USB) || \
@@ -65,9 +64,6 @@ static const struct block_drvr block_drvr[] = {
 #endif
 #if defined(CONFIG_SYSTEMACE)
 	{ .name = "ace", .get_dev = systemace_get_dev, },
-#endif
-#if defined(CONFIG_CMD_MG_DISK)
-	{ .name = "mgd", .get_dev = mg_disk_get_dev, },
 #endif
 	{ },
 };
@@ -80,6 +76,9 @@ block_dev_desc_t *get_dev(char* ifname, int dev)
 	block_dev_desc_t* (*reloc_get_dev)(int dev);
 	char *name;
 
+	if (!ifname)
+		return NULL;
+
 	name = drvr->name;
 #ifdef CONFIG_NEEDS_MANUAL_RELOC
 	name += gd->reloc_off;
@@ -105,7 +104,6 @@ block_dev_desc_t *get_dev(char* ifname, int dev)
 #endif
 
 #if (defined(CONFIG_CMD_IDE) || \
-     defined(CONFIG_CMD_MG_DISK) || \
      defined(CONFIG_CMD_SATA) || \
      defined(CONFIG_CMD_SCSI) || \
      defined(CONFIG_CMD_USB) || \
@@ -241,7 +239,6 @@ void dev_print (block_dev_desc_t *dev_desc)
 #endif
 
 #if (defined(CONFIG_CMD_IDE) || \
-     defined(CONFIG_CMD_MG_DISK) || \
      defined(CONFIG_CMD_SATA) || \
      defined(CONFIG_CMD_SCSI) || \
      defined(CONFIG_CMD_USB) || \