diff options
| author | Eric Anholt <eric@anholt.net> | 2007-07-19 06:31:26 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-07-19 06:31:26 -0700 |
| commit | 05204b9c8d021e019456a8dbd83c012e277c7aaf (patch) | |
| tree | 5639c2821d47e92cc615059cbc12e9c050753230 /linux-core/drm_compat.h | |
| parent | e544286eae71a6b150af4d86096895c14e42c36e (diff) | |
| parent | 0c95d489abd19efd2ba017e78a4b28cea0854e77 (diff) | |
Merge branch 'origin'
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); |