Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6

[cascardo/linux.git] / drivers / char / agp / generic.c

diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 4956f1c..012cba0 100644 (file)
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -81,13 +81,6 @@ static int agp_get_key(void)
        return -1;
 }
 
-void agp_flush_chipset(struct agp_bridge_data *bridge)
-{
-       if (bridge->driver->chipset_flush)
-               bridge->driver->chipset_flush(bridge);
-}
-EXPORT_SYMBOL(agp_flush_chipset);
-
 /*
  * Use kmalloc if possible for the page list. Otherwise fall back to
  * vmalloc. This speeds things up and also saves memory for small AGP
@@ -487,26 +480,6 @@ int agp_unbind_memory(struct agp_memory *curr)
 }
 EXPORT_SYMBOL(agp_unbind_memory);
 
-/**
- *     agp_rebind_emmory  -  Rewrite the entire GATT, useful on resume
- */
-int agp_rebind_memory(void)
-{
-       struct agp_memory *curr;
-       int ret_val = 0;
-
-       spin_lock(&agp_bridge->mapped_lock);
-       list_for_each_entry(curr, &agp_bridge->mapped_list, mapped_list) {
-               ret_val = curr->bridge->driver->insert_memory(curr,
-                                                             curr->pg_start,
-                                                             curr->type);
-               if (ret_val != 0)
-                       break;
-       }
-       spin_unlock(&agp_bridge->mapped_lock);
-       return ret_val;
-}
-EXPORT_SYMBOL(agp_rebind_memory);
 
 /* End - Routines for handling swapping of agp_memory into the GATT */