From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 15 Jun 2009 01:35:21 +0000 (-0400)
Subject: cmd_mmc: make curr_device static
X-Git-Tag: v2009.08-rc1~86
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=02e22c2de1ce2312f2636fa473a60c8d8f18d8aa;p=u-boot

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>
---

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 32fe49b775..0e3393b5f4 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[])
 {