]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
cmd_mmc: make curr_device static
authorMike Frysinger <vapier@gentoo.org>
Mon, 15 Jun 2009 01:35:21 +0000 (21:35 -0400)
committerWolfgang Denk <wd@denx.de>
Fri, 17 Jul 2009 20:14:41 +0000 (22:14 +0200)
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>
common/cmd_mmc.c

index 32fe49b775e0570737037f27d7f6d97a3e61fffb..0e3393b5f44b9d5c7f4b4869658101e1574cd646 100644 (file)
@@ -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[])
 {