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>

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>
Mike Frysinger · Wolfgang Denk
1 parent 2d8d2adde3
Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff
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[])
 {
...	...	@@ -26,7 +26,7 @@
26	26	#include <mmc.h>
27	27
28	28	#ifndef CONFIG_GENERIC_MMC
29		-int curr_device = -1;
	29	+static int curr_device = -1;
30	30
31	31	int do_mmc (cmd_tbl_t cmdtp, int flag, int argc, char argv[])
32	32	{