Merge git://git.denx.de/u-boot-ubi

[people/ms/u-boot.git] / cmd / blk_common.c

diff --git a/cmd/blk_common.c b/cmd/blk_common.c
index 0c0c23eb3701e846a0614c30ddd761581085e831..643fd0bfbc8bee18c060e67914a1d176b45cd4cf 100644 (file)
--- a/cmd/blk_common.c
+++ b/cmd/blk_common.c
@@ -12,7 +12,7 @@
 #include <common.h>
 #include <blk.h>
 
-#ifdef HAVE_BLOCK_DEVICE
+#ifdef CONFIG_HAVE_BLOCK_DEVICE
 int blk_common_cmd(int argc, char * const argv[], enum if_type if_type,
                   int *cur_devnump)
 {
@@ -95,8 +95,6 @@ int blk_common_cmd(int argc, char * const argv[], enum if_type if_type,
                } else {
                        return CMD_RET_USAGE;
                }
-
-               return 0;
        }
 }
 #endif