diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-13 10:08:02 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-13 10:08:02 -0700 |
| commit | 2f03ba4aad1718a36168550b6a146b79540252e6 (patch) | |
| tree | 7bc55a8948f00c60ad2354171dd345e35e6ff741 /linux-core/drm_compat.h | |
| parent | 085df6491e4975681a6e17ff9a67d01268aa7553 (diff) | |
| parent | b0e68829462aad00ce68be998da6313bca754e9a (diff) | |
Merge branch 'master' into modesetting-gem
Conflicts:
libdrm/Makefile.am
libdrm/xf86drm.h
shared-core/i915_dma.c
shared-core/i915_irq.c
Diffstat (limited to 'linux-core/drm_compat.h')
| -rw-r--r-- | linux-core/drm_compat.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h index 35066f29..88c5bb1d 100644 --- a/linux-core/drm_compat.h +++ b/linux-core/drm_compat.h @@ -401,4 +401,12 @@ extern struct page *drm_vm_sg_nopage(struct vm_area_struct *vma, #define drm_core_ioremap_wc drm_core_ioremap #endif +#ifndef OS_HAS_GEM +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) +#define OS_HAS_GEM 1 +#else +#define OS_HAS_GEM 0 +#endif +#endif + #endif |