diff options
| author | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
| commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
| tree | 06a3183a562f8da4688f65023f7a18dcad702956 /drivers/char/agp/ati-agp.c | |
| parent | adf8a287150667feb5747f8beade62acacc17d4e (diff) | |
| parent | 1f1332f727c3229eb2166a83fec5d3de6a73dce2 (diff) | |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'drivers/char/agp/ati-agp.c')
| -rw-r--r-- | drivers/char/agp/ati-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c index d712078ed822..f244c6682738 100644 --- a/drivers/char/agp/ati-agp.c +++ b/drivers/char/agp/ati-agp.c | |||
| @@ -263,7 +263,7 @@ static int agp_ati_resume(struct pci_dev *dev) | |||
| 263 | #endif | 263 | #endif |
| 264 | 264 | ||
| 265 | /* | 265 | /* |
| 266 | *Since we don't need contigious memory we just try | 266 | *Since we don't need contiguous memory we just try |
| 267 | * to get the gatt table once | 267 | * to get the gatt table once |
| 268 | */ | 268 | */ |
| 269 | 269 | ||