svn commit: r293529 - stable/10/sys/compat/linux

[Dmitry Chagin]

Author: dchagin
Date: Sat Jan  9 16:12:37 2016
New Revision: 293529
URL: https://svnweb.freebsd.org/changeset/base/293529

Log:
  MFC r283423:
  
  Move FEATURE macros for v4l and v4l2 to the common module.

Modified:
  stable/10/sys/compat/linux/linux_common.c
  stable/10/sys/compat/linux/linux_ioctl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/compat/linux/linux_common.c
==============================================================================
--- stable/10/sys/compat/linux/linux_common.c	Sat Jan  9 16:11:09 2016	(r293528)
+++ stable/10/sys/compat/linux/linux_common.c	Sat Jan  9 16:12:37 2016	(r293529)
@@ -35,11 +35,15 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/eventhandler.h>
+#include <sys/sysctl.h>
 
 #include <compat/linux/linux_emul.h>
 #include <compat/linux/linux_mib.h>
 #include <compat/linux/linux_util.h>
 
+FEATURE(linuxulator_v4l, "V4L ioctl wrapper support in the linuxulator");
+FEATURE(linuxulator_v4l2, "V4L2 ioctl wrapper support in the linuxulator");
+
 MODULE_VERSION(linux_common, 1);
 
 SET_DECLARE(linux_device_handler_set, struct linux_device_handler);

Modified: stable/10/sys/compat/linux/linux_ioctl.c
==============================================================================
--- stable/10/sys/compat/linux/linux_ioctl.c	Sat Jan  9 16:11:09 2016	(r293528)
+++ stable/10/sys/compat/linux/linux_ioctl.c	Sat Jan  9 16:12:37 2016	(r293529)
@@ -94,9 +94,6 @@ __FBSDID("$FreeBSD$");
 
 CTASSERT(LINUX_IFNAMSIZ == IFNAMSIZ);
 
-FEATURE(linuxulator_v4l, "V4L ioctl wrapper support in the linuxulator");
-FEATURE(linuxulator_v4l2, "V4L2 ioctl wrapper support in the linuxulator");
-
 static linux_ioctl_function_t linux_ioctl_cdrom;
 static linux_ioctl_function_t linux_ioctl_vfat;
 static linux_ioctl_function_t linux_ioctl_console;