diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-07-26 16:58:28 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-07-26 16:58:28 -0700 |
| commit | c561cb4650dc5895acfb3ae00c7ff455be31a860 (patch) | |
| tree | 65b21097253d216e0385778597031ae288e34023 /linux-core/drm_compat.h | |
| parent | 2bafeb673f14b1e3799bf00817138c0b8211635e (diff) | |
| parent | 4175dd818110bd10d6d09190d30c271e89202b18 (diff) | |
Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into xgi-0-0-2
Conflicts:
linux-core/drmP.h
linux-core/drm_scatter.c
Diffstat (limited to 'linux-core/drm_compat.h')
| -rw-r--r-- | linux-core/drm_compat.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h index 024059ac..0b00ba47 100644 --- a/linux-core/drm_compat.h +++ b/linux-core/drm_compat.h @@ -306,8 +306,10 @@ extern int drm_bo_map_bound(struct vm_area_struct *vma); #endif -/* fixme when functions are upstreamed */ +/* fixme when functions are upstreamed - upstreamed for 2.6.23 */ +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)) #define DRM_IDR_COMPAT_FN +#endif #ifdef DRM_IDR_COMPAT_FN int idr_for_each(struct idr *idp, int (*fn)(int id, void *p, void *data), void *data); |