summaryrefslogtreecommitdiff
path: root/linux-core/drm_compat.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2007-10-05 12:11:43 +1000
committerDave Airlie <airlied@redhat.com>2007-10-05 12:11:43 +1000
commit19b7cc34443889fc73de2e10462e1c0f9fa38041 (patch)
tree1cd73a2ef2aaed132cbc766e4ad4a8d2e3dde4e6 /linux-core/drm_compat.h
parentd351601899e5814d809b8e86ab6f0d6e7676f585 (diff)
parent495bbbaadc93c574eb98dd2ad64bdca4d91d4152 (diff)
Merge branch 'pre-superioctl-branch'
Diffstat (limited to 'linux-core/drm_compat.h')
-rw-r--r--linux-core/drm_compat.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h
index 870f8b73..f74f4bc2 100644
--- a/linux-core/drm_compat.h
+++ b/linux-core/drm_compat.h
@@ -193,7 +193,10 @@ extern void drm_clear_vma(struct vm_area_struct *vma,
extern pgprot_t vm_get_page_prot(unsigned long vm_flags);
#ifndef GFP_DMA32
-#define GFP_DMA32 0
+#define GFP_DMA32 GFP_KERNEL
+#endif
+#ifndef __GFP_DMA32
+#define __GFP_DMA32 GFP_KERNEL
#endif
#if defined(CONFIG_X86) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15))