summaryrefslogtreecommitdiffstats
path: root/drivers/char/agp/generic.c
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-12-13 00:13:32 +0100
committerDave Jones <davej@redhat.com>2006-12-13 00:13:32 +0100
commitf0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch)
tree2472e94d39f43a9580a6d2d5d92de0b749023263 /drivers/char/agp/generic.c
parent[AGPGART] VIA and SiS AGP chipsets are x86-only (diff)
parent[PATCH] remove config ordering/dependency between ucb1400-ts and sound subsystem (diff)
downloadlinux-f0eef25339f92f7cd4aeea23d9ae97987a5a1e82.tar.xz
linux-f0eef25339f92f7cd4aeea23d9ae97987a5a1e82.zip
Merge ../linus
Diffstat (limited to 'drivers/char/agp/generic.c')
-rw-r--r--drivers/char/agp/generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index ca4629f66d17..883a36a27833 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -1079,7 +1079,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;