diff options
| author | Dmitry V. Levin <ldv@strace.io> | 2023-04-16 22:23:53 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2023-04-28 08:00:00 +0000 |
| commit | 267b19178e2d4a31fc54624ff99c5c9218134c81 (patch) | |
| tree | 9795b2e8d5291b0bc9878965ddb3a425edc29815 /bundled/linux/include/uapi/linux/v4l2-controls.h | |
| parent | 4d9a6f0ac6bd8e8644340e3de3f6a2f4b164f2fe (diff) | |
| download | strace-267b19178e2d4a31fc54624ff99c5c9218134c81.tar.gz | |
bundled: update linux UAPI headers to v6.3-rc7
* bundled/linux/include/uapi/linux/btrfs.h: Update to headers_install'ed
Linux kernel v6.3-rc7.
* bundled/linux/include/uapi/linux/dcbnl.h: Likewise.
* bundled/linux/include/uapi/linux/fcntl.h: Likewise.
* bundled/linux/include/uapi/linux/if_bridge.h: Likewise.
* bundled/linux/include/uapi/linux/if_link.h: Likewise.
* bundled/linux/include/uapi/linux/in.h: Likewise.
* bundled/linux/include/uapi/linux/io_uring.h: Likewise.
* bundled/linux/include/uapi/linux/memfd.h: Likewise.
* bundled/linux/include/uapi/linux/netfilter/nf_tables.h: Likewise.
* bundled/linux/include/uapi/linux/netfilter/nfnetlink_cttimeout.h: Likewise.
* bundled/linux/include/uapi/linux/prctl.h: Likewise.
* bundled/linux/include/uapi/linux/rtnetlink.h: Likewise.
* bundled/linux/include/uapi/linux/v4l2-controls.h: Likewise.
* bundled/linux/include/uapi/linux/version.h: Likewise.
* bundled/linux/include/uapi/linux/videodev2.h: Likewise.
Diffstat (limited to 'bundled/linux/include/uapi/linux/v4l2-controls.h')
| -rw-r--r-- | bundled/linux/include/uapi/linux/v4l2-controls.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bundled/linux/include/uapi/linux/v4l2-controls.h b/bundled/linux/include/uapi/linux/v4l2-controls.h index 80d2377c5..2ee4c2fcc 100644 --- a/bundled/linux/include/uapi/linux/v4l2-controls.h +++ b/bundled/linux/include/uapi/linux/v4l2-controls.h @@ -115,9 +115,13 @@ enum v4l2_colorfx { /* USER-class private control IDs */ -/* The base for the meye driver controls. See linux/meye.h for the list - * of controls. We reserve 16 controls for this driver. */ +#ifndef __KERNEL__ +/* + * The base for the meye driver controls. This driver was removed, but + * we keep this define in case any software still uses it. + */ #define V4L2_CID_USER_MEYE_BASE (V4L2_CID_USER_BASE + 0x1000) +#endif /* The base for the bttv driver controls. * We reserve 32 controls for this driver. */ |