summaryrefslogtreecommitdiffstats
path: root/drivers/char/agp/via-agp.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-20 23:39:47 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-20 23:39:47 +0100
commit55fa518867978e1f5fd8353098f80d125ac734d7 (patch)
tree3502b331c1f9ec4cac25dc8ba30b6a0a324e350c /drivers/char/agp/via-agp.c
parentALSA: ca0106 MSI K8N Diamond MB spi_dac 2->1 (diff)
parentALSA: pcsp - Fix starting the stream with HRTIMER_CB_IRQSAFE_UNLOCK (diff)
downloadlinux-55fa518867978e1f5fd8353098f80d125ac734d7.tar.xz
linux-55fa518867978e1f5fd8353098f80d125ac734d7.zip
Merge branch 'topic/pcsp-fix' into topic/misc
Diffstat (limited to 'drivers/char/agp/via-agp.c')
-rw-r--r--drivers/char/agp/via-agp.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index 7b36476dff41..d3bd243867fc 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -190,7 +190,9 @@ static const struct agp_bridge_driver via_agp3_driver = {
.alloc_by_type = agp_generic_alloc_by_type,
.free_by_type = agp_generic_free_by_type,
.agp_alloc_page = agp_generic_alloc_page,
+ .agp_alloc_pages = agp_generic_alloc_pages,
.agp_destroy_page = agp_generic_destroy_page,
+ .agp_destroy_pages = agp_generic_destroy_pages,
.agp_type_to_mask_type = agp_generic_type_to_mask_type,
};
@@ -214,7 +216,9 @@ static const struct agp_bridge_driver via_driver = {
.alloc_by_type = agp_generic_alloc_by_type,
.free_by_type = agp_generic_free_by_type,
.agp_alloc_page = agp_generic_alloc_page,
+ .agp_alloc_pages = agp_generic_alloc_pages,
.agp_destroy_page = agp_generic_destroy_page,
+ .agp_destroy_pages = agp_generic_destroy_pages,
.agp_type_to_mask_type = agp_generic_type_to_mask_type,
};
@@ -591,4 +595,4 @@ module_init(agp_via_init);
module_exit(agp_via_cleanup);
MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Dave Jones <davej@codemonkey.org.uk>");
+MODULE_AUTHOR("Dave Jones <davej@redhat.com>");