diff options
author | dchagin <dchagin@FreeBSD.org> | 2015-05-24 16:00:01 +0000 |
---|---|---|
committer | dchagin <dchagin@FreeBSD.org> | 2015-05-24 16:00:01 +0000 |
commit | 5b7bd42ffe60c56b4a4f470f7c692c1392e0c502 (patch) | |
tree | fd0bd5b35afee0cacb5ce9d6978e27d63605d218 /sys | |
parent | f18b3d51fa76d8d28f216bd46d2f0a5088cfc570 (diff) | |
download | FreeBSD-src-5b7bd42ffe60c56b4a4f470f7c692c1392e0c502.zip FreeBSD-src-5b7bd42ffe60c56b4a4f470f7c692c1392e0c502.tar.gz |
Move FEATURE macros for v4l and v4l2 to the common module.
Differential Revision: https://reviews.freebsd.org/D1075
Reviewed by: emaste
Diffstat (limited to 'sys')
-rw-r--r-- | sys/compat/linux/linux_common.c | 4 | ||||
-rw-r--r-- | sys/compat/linux/linux_ioctl.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/compat/linux/linux_common.c b/sys/compat/linux/linux_common.c index 3cee92a..b9e3531 100644 --- a/sys/compat/linux/linux_common.c +++ b/sys/compat/linux/linux_common.c @@ -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); diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 5ca1d1c..b0a56b4 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -95,9 +95,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; |