diff options
| author | dchagin <dchagin@FreeBSD.org> | 2016-01-09 16:12:37 +0000 |
|---|---|---|
| committer | dchagin <dchagin@FreeBSD.org> | 2016-01-09 16:12:37 +0000 |
| commit | 2b349bc9ba6070a75ed2b3737f52cfc62b00bf5c (patch) | |
| tree | 4b3fbed7d509ff6b0c50283266d8570430123191 /sys | |
| parent | 6c12e20ac1e5ea5573246049365409feabb20095 (diff) | |
| download | FreeBSD-src-2b349bc9ba6070a75ed2b3737f52cfc62b00bf5c.zip FreeBSD-src-2b349bc9ba6070a75ed2b3737f52cfc62b00bf5c.tar.gz | |
MFC r283423:
Move FEATURE macros for v4l and v4l2 to the common module.
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 b204eec..fc7fb26 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -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; |
