The patch titled pcmcia/pcnet_cs: fix 'shadow variable' warning has been added to the -mm tree. Its filename is pcmcia-pcnet_cs-fix-shadow-variable-warning.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: pcmcia/pcnet_cs: fix 'shadow variable' warning From: Richard Knutsson <ricknu-0@xxxxxxxxxxxxxx> Fixing: CHECK drivers/net/pcmcia/pcnet_cs.c drivers/net/pcmcia/pcnet_cs.c:523:15: warning: symbol 'hw_info' shadows an earlier one drivers/net/pcmcia/pcnet_cs.c:148:18: originally declared here Signed-off-by: Richard Knutsson <ricknu-0@xxxxxxxxxxxxxx> Acked-by: Alan Cox <alan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/pcmcia/pcnet_cs.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff -puN drivers/net/pcmcia/pcnet_cs.c~pcmcia-pcnet_cs-fix-shadow-variable-warning drivers/net/pcmcia/pcnet_cs.c --- a/drivers/net/pcmcia/pcnet_cs.c~pcmcia-pcnet_cs-fix-shadow-variable-warning +++ a/drivers/net/pcmcia/pcnet_cs.c @@ -521,7 +521,7 @@ static int pcnet_config(struct pcmcia_de int i, last_ret, last_fn, start_pg, stop_pg, cm_offset; int has_shmem = 0; u_short buf[64]; - hw_info_t *hw_info; + hw_info_t *local_hw_info; DECLARE_MAC_BUF(mac); DEBUG(0, "pcnet_config(0x%p)\n", link); @@ -590,23 +590,23 @@ static int pcnet_config(struct pcmcia_de dev->if_port = 0; } - hw_info = get_hwinfo(link); - if (hw_info == NULL) - hw_info = get_prom(link); - if (hw_info == NULL) - hw_info = get_dl10019(link); - if (hw_info == NULL) - hw_info = get_ax88190(link); - if (hw_info == NULL) - hw_info = get_hwired(link); + local_hw_info = get_hwinfo(link); + if (local_hw_info == NULL) + local_hw_info = get_prom(link); + if (local_hw_info == NULL) + local_hw_info = get_dl10019(link); + if (local_hw_info == NULL) + local_hw_info = get_ax88190(link); + if (local_hw_info == NULL) + local_hw_info = get_hwired(link); - if (hw_info == NULL) { + if (local_hw_info == NULL) { printk(KERN_NOTICE "pcnet_cs: unable to read hardware net" " address for io base %#3lx\n", dev->base_addr); goto failed; } - info->flags = hw_info->flags; + info->flags = local_hw_info->flags; /* Check for user overrides */ info->flags |= (delay_output) ? DELAY_OUTPUT : 0; if ((link->manf_id == MANFID_SOCKET) && _ Patches currently in -mm which might be from ricknu-0@xxxxxxxxxxxxxx are origin.patch kernel-compliment-va_copy-with-va_end.patch git-dvb.patch pcmcia-3c574_cs-fix-dubious-bitfield-warning.patch pcmcia-3c574_cs-fix-shadow-variable-warning.patch pcmcia-axnet_cs-make-functions-static.patch pcmcia-axnet_cs-make-use-of-max-instead-of-handcrafted-one.patch pcmcia-fmvj18x_cs-fix-shadow-variable-warning.patch pcmcia-pcnet_cs-fix-shadow-variable-warning.patch mm-mmap-remove-sparse-warning-null-as-0.patch dio-array_size-cleanup-update.patch dio-array_size-cleanup-update-checkpatch-fixes.patch reiserfs-complement-va_start-with-va_end.patch kernel-paramsc-remove-sparse-warning-different-signedness.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html