Revert "Fix v4l2 build failure on Debian/kfreebsd"

This reverts commit 7711eb75. This makes no sense as control types are _not_ macros.

Revert "Fix v4l2 build failure on Debian/kfreebsd"
This reverts commit 7711eb75. This makes no sense as control types are _not_ macros.
74ba8ca7 · Rémi Denis-Courmont · 3e48c330 · 74ba8ca7
Commit 74ba8ca7 authored Feb 28, 2012 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

modules/access/v4l2/v4l2.h modules/access/v4l2/v4l2.h +5 -2

No files found.
--- a/modules/access/v4l2/v4l2.h
+++ b/modules/access/v4l2/v4l2.h
@@ -40,8 +40,11 @@
 # define V4L2_STD_MTS (V4L2_STD_NTSC_M|V4L2_STD_PAL_M|V4L2_STD_PAL_N|\
                       V4L2_STD_PAL_Nc)
 #endif
-#ifndef V4L2_CTRL_TYPE_BITMASK /* 3.1 */
+#ifdef __linux__
-# define V4L2_CTRL_TYPE_BITMASK 8
+# include <linux/version.h>
+# if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
+#  define V4L2_CTRL_TYPE_BITMASK 8
+# endif
 #endif
 #ifndef V4L2_CID_ILLUMINATORS_1 /* 2.6.37 */
 # define V4L2_CID_ILLUMINATORS_1 (V4L2_CID_BASE+38)