The patch titled agp: fix shadowed variable warning in amd-k7-agp.c has been removed from the -mm tree. Its filename was agp-fix-shadowed-variable-warning-in-amd-k7-agpc.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: agp: fix shadowed variable warning in amd-k7-agp.c From: Harvey Harrison <harvey.harrison@xxxxxxxxx> Introduced between 2.6.25-rc2 and -rc3 drivers/char/agp/amd-k7-agp.c:439:6: warning: symbol 'cap_ptr' shadows an earlier one drivers/char/agp/amd-k7-agp.c:414:5: originally declared here cap_ptr is never used again in this function, don't bother redeclaring. Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx> Cc: Dave Airlie <airlied@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/char/agp/amd-k7-agp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/char/agp/amd-k7-agp.c~agp-fix-shadowed-variable-warning-in-amd-k7-agpc drivers/char/agp/amd-k7-agp.c --- a/drivers/char/agp/amd-k7-agp.c~agp-fix-shadowed-variable-warning-in-amd-k7-agpc +++ a/drivers/char/agp/amd-k7-agp.c @@ -436,8 +436,9 @@ static int __devinit agp_amdk7_probe(str system controller may experience noise due to strong drive strengths */ if (agp_bridge->dev->device == PCI_DEVICE_ID_AMD_FE_GATE_7006) { - u8 cap_ptr=0; struct pci_dev *gfxcard=NULL; + + cap_ptr = 0; while (!cap_ptr) { gfxcard = pci_get_class(PCI_CLASS_DISPLAY_VGA<<8, gfxcard); if (!gfxcard) { _ Patches currently in -mm which might be from harvey.harrison@xxxxxxxxx are origin.patch git-agpgart.patch cifs-remove-global_extern-macro.patch git-dvb.patch git-kvm.patch git-mips.patch git-nfsd.patch nfs-replace-remaining-__function__-occurrences.patch parisc-replace-remaining-__function__-occurences.patch drivers-parisc-replace-remaining-__function__-occurrences.patch pcmcia-replace-remaining-__function__-occurrences.patch scsi-replace-remaining-__function__-occurrences.patch fusion-replace-remaining-__function__-occurrences.patch scsi-replace-__inline-with-inline.patch git-watchdog.patch git-xfs.patch xtensa-replace-remaining-__function__-occurences.patch remove-sparse-warning-for-mmzoneh.patch remove-sparse-warning-for-mmzoneh-checkpatch-fixes.patch input-replace-remaining-__function__-occurrences.patch smack-fix-integer-as-null-pointer-warning-in-smack_lsmc.patch alpha-remove-remaining-__function__-occurences.patch alpha-replace-__inline-with-inline.patch power-replace-remaining-__function__-occurrences.patch m68k-replace-remaining-__function__-occurences.patch uml-replace-remaining-__function__-occurences.patch adfs-work-around-bogus-sparse-warning.patch coda-add-static-to-functions-in-dirc.patch befs-fix-sparse-warning-in-linuxvfsc.patch autofs4-fix-sparse-warning-in-rootc.patch firmware-replace-remaining-__function__-occurrences.patch drivers-misc-replace-remaining-__function__-occurrences.patch ncpfs-add-prototypes-to-ncp_fsh.patch ncpfs-fix-sparse-warnings-in-ioctlc.patch ncpfs-fix-sparse-warning-in-ncpsign_kernelc.patch char-make-functions-static-in-synclinkmpc.patch spi-replace-remaining-__function__-occurrences.patch capi-fix-sparse-warnings-using-integer-as-null-pointer.patch avm-fix-sparse-warning-using-integer-as-null-pointer.patch eicon-fix-sparse-integer-as-null-pointer-warnings.patch isdn-replace-remaining-__function__-occurrences.patch xen-make-blkif_getgeo-static.patch ecryptfs-replace-remaining-__function__-occurrences.patch rtc-replace-remaining-__function__-occurrences.patch fbcon-replace-mono_col-macro-with-static-inline.patch fbcon-replace-mono_col-macro-with-static-inline-fix.patch video-replace-remaining-__function__-occurrences.patch md-fix-integer-as-null-pointer-warnings-in-mdc.patch md-replace-remaining-__function__-occurrences.patch ext2-replace-remaining-__function__-occurrences.patch ext3-replace-remaining-__function__-occurrences.patch jbd-replace-remaining-__function__-occurrences.patch ufs-replace-remaining-__function__-occurrences.patch ufs-replace-__inline-with-inline.patch udf-fix-sparse-warning-in-nameic.patch reiserfs-fix-sparse-warning-in-journalc.patch reiserfs-fix-more-sparse-warnings-in-do_balanc.patch reiserfs-replace-remaining-__function__-occurrences.patch cgroup-fix-sparse-warning-of-shadow-symbol-in-cgroupc.patch ext4-replace-remaining-__function__-occurrences.patch jdb2-replace-remaining-__function__-occurrences.patch char-fix-sparse-shadowed-variable-warnings-in-espc.patch char-espc-fix-possible-double-unlock.patch char-rocketc-fix-sparse-variable-shadowing-and-int-as-null-pointer.patch cycladesc-fix-sparse-shadowed-variable-warnings.patch epcac-static-functions-and-integer-as-null-pointer-fixes.patch epcac-static-functions-and-integer-as-null-pointer-fixes-checkpatch-fixes.patch add-macros-similar-to-min-max-min_t-max_t.patch add-macros-similar-to-min-max-min_t-max_t-doc.patch ide-eliminate-fit-macro.patch ata-remove-fit-macro.patch b43-replace-limit_value-macro-with-clamp_val.patch b43legacy-replace-limit_value-macro-with-clamp_val.patch fuse-use-clamp-rather-than-nested-min-max.patch ide-tape-use-clamp_t-rather-than-nested-min_t-max_t.patch input-ff-memlessc-use-clamp_val-macro.patch dccp-ccid2c-ccid3c-use-clamp-clamp_t.patch drivers-replace-remaining-__function__-occurrences.patch kernel-add-common-infrastructure-for-unaligned-access.patch kernel-move-arches-to-use-common-unaligned-access.patch drivers-block-use-get_unaligned_-helpers.patch hid-core-use-get_unaligned_-helpers.patch char-use-get_unaligned_-helpers.patch input-use-get_unaligned_-helpers.patch mmc-use-get-put_unaligned_-helpers.patch net-use-get-put_unaligned_-helpers.patch wireless-use-get-put_unaligned_-helpers.patch pcmcia-use-get-put_unaligned_-helpers.patch usb-use-get-put_unaligned_-helpers.patch video-use-get-put_unaligned_-helpers.patch fat-use-get-put_unaligned_-helpers.patch hfsplus-use-get-put_unaligned_-helpers.patch isofs-use-get-put_unaligned_-helpers.patch ncpfs-use-get-put_unaligned_-helpers.patch ncpfs-use-get-put_unaligned_-helpers-checkpatch-fixes.patch mm-remove-remaining-__function__-occurances.patch block-remove-remaining-__function__-occurances.patch kernel-replace-remaining-__function__-occurances.patch lib-replace-remaining-__function__-occurances.patch afs-replace-remaining-__function__-occurrences.patch fs-replace-remaining-__function__-occurrences.patch drivers-char-replace-remaining-__function__-occurrences.patch serial-replace-remaining-__function__-occurrences.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