diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-06-14 21:35:22 -0400 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-17 22:15:27 +0200 |
| commit | 569460ebf14b87bd8fdb2352bde95d35ee96e13b (patch) | |
| tree | fc59dfc9e8b70f18c275da33b1c84945e7a203ef /drivers/block | |
| parent | 02e22c2de1ce2312f2636fa473a60c8d8f18d8aa (diff) | |
| download | u-boot-569460ebf14b87bd8fdb2352bde95d35ee96e13b.tar.gz u-boot-569460ebf14b87bd8fdb2352bde95d35ee96e13b.tar.bz2 u-boot-569460ebf14b87bd8fdb2352bde95d35ee96e13b.zip | |
sata: namespace curr_device variable
The curr_device variable really should be namespaced with a "sata_" prefix
since it is only used by the sata code. It also avoids random conflicts
with other pieces of code (like cmd_mmc):
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>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/ata_piix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/ata_piix.c b/drivers/block/ata_piix.c index ec3768711a..549de31235 100644 --- a/drivers/block/ata_piix.c +++ b/drivers/block/ata_piix.c @@ -36,7 +36,7 @@ #include <ata.h> extern block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE]; -extern int curr_device; +extern int sata_curr_device; #define DEBUG_SATA 0 /*For debug prints set DEBUG_SATA to 1 */ @@ -204,8 +204,8 @@ init_sata (int dev) dev_print (&sata_dev_desc[devno]); /* initialize partition type */ init_part (&sata_dev_desc[devno]); - if (curr_device < 0) - curr_device = + if (sata_curr_device < 0) + sata_curr_device = i * CONFIG_SYS_SATA_DEVS_PER_BUS + j; } } |