From: Harvey Harrison 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 Cc: Dave Airlie Signed-off-by: Andrew Morton --- 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) { _