diff options
| author | Andi Kleen <andi@basil.nowhere.org> | 2006-11-28 20:12:29 +0100 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-11-28 20:12:29 +0100 |
| commit | a3550a9c543556cf7764be81aeb17c6dab440753 (patch) | |
| tree | e8c8bf721cc917c8842c4a007ad4b3f68eb7aa1e /drivers/char/agp/generic.c | |
| parent | 9a14f2964b459c18198ee59ff7212321def82df7 (diff) | |
| parent | 2ea5814472c3c910aed5c5b60f1f3b1000e353f1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/agp/generic.c')
| -rw-r--r-- | drivers/char/agp/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index c3920016168..5ff457b41ef 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c @@ -1054,7 +1054,7 @@ void *agp_generic_alloc_page(struct agp_bridge_data *bridge) { struct page * page; - page = alloc_page(GFP_KERNEL); + page = alloc_page(GFP_KERNEL | GFP_DMA32); if (page == NULL) return NULL; |