Merge commit 'v2.6.39-rc3' into for-2.6.39

[pandora-kernel.git] / drivers / char / agp / via-agp.c

diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index df67e80..8bc3849 100644 (file)
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -400,7 +400,7 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata =
         * the traditional AGP which resides only in chipset. AGP is used
         * by 3D driver which wasn't available for the VT3336 and VT3364
         * generation until now.  Unfortunately, by testing, VT3364 works
-        * but VT3336 doesn't. - explaination from via, just leave this as
+        * but VT3336 doesn't. - explanation from via, just leave this as
         * as a placeholder to avoid future patches adding it back in.
         */
 #if 0