diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-28 00:01:34 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-28 00:01:34 -0400 |
| commit | 1dbbb6077426f8ce63d6a59c5ac6613e1689cbde (patch) | |
| tree | 6141d4d7a8eb7c557705bdfa764137d4fd2e4924 /drivers/char/agp/amd-k7-agp.c | |
| parent | d09e860cf07e7c9ee12920a09f5080e30a12a23a (diff) | |
| parent | 064922a805ec7aadfafdd27aa6b4908d737c3c1d (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/agp/amd-k7-agp.c')
| -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) { |