agp: fix shadowed variable warning in amd-k7-agp.c
authorHarvey Harrison <harvey.harrison@gmail.com>
Sat, 26 Apr 2008 08:38:04 +0000 (18:38 +1000)
committerDave Airlie <airlied@linux.ie>
Sat, 26 Apr 2008 08:38:04 +0000 (18:38 +1000)
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@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
drivers/char/agp/amd-k7-agp.c

index d28669992147556cb6107d5fe3f8de9bb4d4264a..96bdb9296b0758832214aad8393f37569d258916 100644 (file)
@@ -436,8 +436,9 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev,
           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) {