summaryrefslogtreecommitdiffstats
path: root/drivers/char/agp/generic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 09:17:32 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 09:17:32 -0800
commit2e9abdd9bad485970b37cd53a82f92702054984c (patch)
tree8f473a59aae906e65d0f78bbc98a8db12401d5d2 /drivers/char/agp/generic.c
parentc36cd16f78a5dd740a619ef8445e35a73484d58b (diff)
parent9d1f6b28ee2429a1f94a9f7074ffae7f918d33be (diff)
downloadlinux-2e9abdd9bad485970b37cd53a82f92702054984c.tar.gz
linux-2e9abdd9bad485970b37cd53a82f92702054984c.tar.bz2
linux-2e9abdd9bad485970b37cd53a82f92702054984c.zip
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.c2
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);
/**
* agp_copy_info - copy bridge state information
*
- * @info: agp_kern_info pointer. The caller should insure that this pointer is valid.
+ * @info: agp_kern_info pointer. The caller should insure that this pointer is valid.
*
* This function copies information about the agp bridge device and the state of
* the agp backend into an agp_kern_info pointer.