Browse Source

[PATCH] get_dev() now unconditionally uses manual relocation

Since the relocation fix is not included yet and we're not sure how
it will be added, this patch removes code that required relocation
to be fixed for now.

Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese 18 years ago
parent
commit
6c7cac8c4f
1 changed files with 1 additions and 9 deletions
  1. 1 9
      disk/part.c

+ 1 - 9
disk/part.c

@@ -64,25 +64,17 @@ static const struct block_drvr block_drvr[] = {
 	{ },
 };
 
-#ifndef CFG_FIXUP_RELOCATION
 DECLARE_GLOBAL_DATA_PTR;
-#endif
 
 block_dev_desc_t *get_dev(char* ifname, int dev)
 {
 	const struct block_drvr *drvr = block_drvr;
+	block_dev_desc_t* (*reloc_get_dev)(int dev);
 
 	while (drvr->name) {
-#ifndef CFG_FIXUP_RELOCATION
-		block_dev_desc_t* (*reloc_get_dev)(int dev);
-
 		reloc_get_dev = drvr->get_dev + gd->reloc_off;
 		if (strncmp(ifname, drvr->name, strlen(drvr->name)) == 0)
 			return reloc_get_dev(dev);
-#else
-		if (strncmp(ifname, drvr->name, strlen(drvr->name)) == 0)
-			return drvr->get_dev(dev);
-#endif
 		drvr++;
 	}
 	return NULL;