summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-07-18 09:46:16 +1000
committerDave Airlie <airlied@linux.ie>2007-07-18 09:46:16 +1000
commit3a71e87742ce8686c2b3c85ebbc8fb7a72b4f6e0 (patch)
tree6d293742be0d62e383e6279cadf94da27c6a30d2 /linux-core
parent6ad1df217647d112a21c2e004d4e3d74c7bb0e0e (diff)
drm: idr stuff is upstream for 2.6.23
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_compat.h4
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);