diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:30:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:30:26 -0400 |
| commit | 037a6079eb925f7653bddf1501f777abcd4fc91e (patch) | |
| tree | 2249c4c4852837163e67190bf8bfe06516a65510 /drivers/char/agp/i460-agp.c | |
| parent | 0754557d72c1fbfc5fcfd5235e7c23ae6f77248c (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/gart
Diffstat (limited to 'drivers/char/agp/i460-agp.c')
| -rw-r--r-- | drivers/char/agp/i460-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c index 76f581c85a7d..e587eebebc67 100644 --- a/drivers/char/agp/i460-agp.c +++ b/drivers/char/agp/i460-agp.c | |||
| @@ -580,7 +580,7 @@ const struct agp_bridge_driver intel_i460_driver = { | |||
| 580 | .alloc_by_type = agp_generic_alloc_by_type, | 580 | .alloc_by_type = agp_generic_alloc_by_type, |
| 581 | .free_by_type = agp_generic_free_by_type, | 581 | .free_by_type = agp_generic_free_by_type, |
| 582 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, | 582 | .agp_type_to_mask_type = agp_generic_type_to_mask_type, |
| 583 | .cant_use_aperture = 1, | 583 | .cant_use_aperture = true, |
| 584 | }; | 584 | }; |
| 585 | 585 | ||
| 586 | static int __devinit agp_intel_i460_probe(struct pci_dev *pdev, | 586 | static int __devinit agp_intel_i460_probe(struct pci_dev *pdev, |