diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 12:17:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 12:17:32 -0500 |
| commit | 2e9abdd9bad485970b37cd53a82f92702054984c (patch) | |
| tree | 8f473a59aae906e65d0f78bbc98a8db12401d5d2 /drivers/char/agp/generic.c | |
| parent | c36cd16f78a5dd740a619ef8445e35a73484d58b (diff) | |
| parent | 9d1f6b28ee2429a1f94a9f7074ffae7f918d33be (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
[AGPGART] x86_64: Enable VIA AGP driver on x86-64 for VIA P4 chipsets
[AGPGART] x86_64: Fix wrong PCI ID for ALI M1695 AGP bridge
[AGPGART] ATI RS350 support.
[AGPGART] Lots of CodingStyle/whitespace cleanups.
Diffstat (limited to 'drivers/char/agp/generic.c')
| -rw-r--r-- | drivers/char/agp/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index 5567ce8d72b0..4e1891e2c035 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c | |||
| @@ -299,7 +299,7 @@ EXPORT_SYMBOL_GPL(agp_num_entries); | |||
| 299 | /** | 299 | /** |
| 300 | * agp_copy_info - copy bridge state information | 300 | * agp_copy_info - copy bridge state information |
| 301 | * | 301 | * |
| 302 | * @info: agp_kern_info pointer. The caller should insure that this pointer is valid. | 302 | * @info: agp_kern_info pointer. The caller should insure that this pointer is valid. |
| 303 | * | 303 | * |
| 304 | * This function copies information about the agp bridge device and the state of | 304 | * This function copies information about the agp bridge device and the state of |
| 305 | * the agp backend into an agp_kern_info pointer. | 305 | * the agp backend into an agp_kern_info pointer. |