summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
Diffstat (limited to 'v4l')
-rw-r--r--v4l/compat.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/v4l/compat.h b/v4l/compat.h
index 3910ae2aa..05bada3bc 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -284,7 +284,10 @@ static inline int vm_insert_page(struct vm_area_struct *vma,
# define class_destroy(a) class_simple_destroy(a)
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
# define class_device_create(a, b, c, d, e, f, g, h) class_device_create(a, c, d, e, f, g, h)
-#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+#endif
+/* device_create/destroy added in 2.6.18 */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+/* on older kernels, class_device_create will in turn be a compat macro */
# define device_create(a, b, c, d, e, f, g) class_device_create(a, NULL, c, b, d, e, f, g)
# define device_destroy(a, b) class_device_destroy(a, b)
#endif