diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
| commit | f0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch) | |
| tree | 2472e94d39f43a9580a6d2d5d92de0b749023263 /drivers/char/agp/generic.c | |
| parent | 0cfea5dd98205f2fa318836da664a7d7df1afbc1 (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
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 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) | |||
| 1079 | { | 1079 | { |
| 1080 | struct page * page; | 1080 | struct page * page; |
| 1081 | 1081 | ||
| 1082 | page = alloc_page(GFP_KERNEL); | 1082 | page = alloc_page(GFP_KERNEL | GFP_DMA32); |
| 1083 | if (page == NULL) | 1083 | if (page == NULL) |
| 1084 | return NULL; | 1084 | return NULL; |
| 1085 | 1085 | ||