diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-26 04:38:04 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2008-04-26 04:38:04 -0400 |
commit | 4ab92bcf773e7b9e1367897047d5fa4d151d9e90 (patch) | |
tree | a3a07dfb9e0249ead26d3ba2e43da500bb312419 | |
parent | b1721d0da266b4af8cb4419473b4ca36206ab200 (diff) |
agp: fix shadowed variable warning in amd-k7-agp.c
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>
-rw-r--r-- | drivers/char/agp/amd-k7-agp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c index d28669992147..96bdb9296b07 100644 --- a/drivers/char/agp/amd-k7-agp.c +++ b/drivers/char/agp/amd-k7-agp.c | |||
@@ -436,8 +436,9 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev, | |||
436 | system controller may experience noise due to strong drive strengths | 436 | system controller may experience noise due to strong drive strengths |
437 | */ | 437 | */ |
438 | if (agp_bridge->dev->device == PCI_DEVICE_ID_AMD_FE_GATE_7006) { | 438 | if (agp_bridge->dev->device == PCI_DEVICE_ID_AMD_FE_GATE_7006) { |
439 | u8 cap_ptr=0; | ||
440 | struct pci_dev *gfxcard=NULL; | 439 | struct pci_dev *gfxcard=NULL; |
440 | |||
441 | cap_ptr = 0; | ||
441 | while (!cap_ptr) { | 442 | while (!cap_ptr) { |
442 | gfxcard = pci_get_class(PCI_CLASS_DISPLAY_VGA<<8, gfxcard); | 443 | gfxcard = pci_get_class(PCI_CLASS_DISPLAY_VGA<<8, gfxcard); |
443 | if (!gfxcard) { | 444 | if (!gfxcard) { |