Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[~andy/linux] / drivers / char / agp / intel-agp.c

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index fe6fc382190fab1a37879db2af15430ecdc3d887..eeea50a1d22ace69991af91a7bcee524a4319e3e 100644 (file)
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -597,7 +597,6 @@ static void intel_i830_fini_flush(void)
        kunmap(intel_private.i8xx_page);
        intel_private.i8xx_flush_page = NULL;
        unmap_page_from_agp(intel_private.i8xx_page);
-       flush_agp_mappings();
 
        __free_page(intel_private.i8xx_page);
        intel_private.i8xx_page = NULL;
@@ -615,7 +614,6 @@ static void intel_i830_setup_flush(void)
 
        /* make page uncached */
        map_page_into_agp(intel_private.i8xx_page);
-       flush_agp_mappings();
 
        intel_private.i8xx_flush_page = kmap(intel_private.i8xx_page);
        if (!intel_private.i8xx_flush_page)