Merge branch 'for-next' into for-linus

[safe/jmp/linux-2.6] / drivers / char / agp / intel-agp.c

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 919a285..a3e10dc 100644 (file)
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -298,7 +298,7 @@ static void intel_agp_insert_sg_entries(struct agp_memory *mem,
                        j++;
                }
        } else {
-               /* sg may merge pages, but we have to seperate
+               /* sg may merge pages, but we have to separate
                 * per-page addr for GTT */
                unsigned int len, m;