summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-06-14 21:35:21 -0400
committerWolfgang Denk <wd@denx.de>2009-07-17 22:14:41 +0200
commit02e22c2de1ce2312f2636fa473a60c8d8f18d8aa (patch)
tree8e711777eafa4ee18a3dd0cc417bf14dfaff71ee
parent2d8d2adde3fce1152e4ad9f47238f07e70793c53 (diff)
downloadu-boot-imx-02e22c2de1ce2312f2636fa473a60c8d8f18d8aa.zip
u-boot-imx-02e22c2de1ce2312f2636fa473a60c8d8f18d8aa.tar.gz
u-boot-imx-02e22c2de1ce2312f2636fa473a60c8d8f18d8aa.tar.bz2
cmd_mmc: make curr_device static
The curr_device variable isn't used outside of cmd_mmc, so mark it static to avoid conflicts with other pieces of code (like sata which also exports a curr_device). Otherwise we end up with stuff like: common/libcommon.a(cmd_sata.o):(.data.curr_device+0x0): multiple definition of `curr_device' common/libcommon.a(cmd_mmc.o):(.data.curr_device+0x0): first defined here Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--common/cmd_mmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 32fe49b..0e3393b 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -26,7 +26,7 @@
#include <mmc.h>
#ifndef CONFIG_GENERIC_MMC
-int curr_device = -1;
+static int curr_device = -1;
int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{