From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Tue, 15 Jun 2010 21:59:21 +0000 (+0200)
Subject: stellaris: -Wshadow warning fixes
X-Git-Tag: v0.5.0-rc1~606
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e53836718664e507a9cb431444a0fc9021ebae04;p=openocd

stellaris: -Wshadow warning fixes

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
---

diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c
index f7e2e8d9..ff1c2e48 100644
--- a/src/flash/nor/stellaris.c
+++ b/src/flash/nor/stellaris.c
@@ -255,7 +255,7 @@ FLASH_BANK_COMMAND_HANDLER(stellaris_flash_bank_command)
 	return ERROR_OK;
 }
 
-static int stellaris_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_stellaris_info(struct flash_bank *bank, char *buf, int buf_size)
 {
 	int printed, device_class;
 	struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
@@ -1272,5 +1272,5 @@ struct flash_driver stellaris_flash = {
 	.auto_probe = stellaris_probe,
 	.erase_check = default_flash_mem_blank_check,
 	.protect_check = stellaris_protect_check,
-	.info = stellaris_info,
+	.info = get_stellaris_info,
 };