diff mbox series

[1/4] HEADERS, do not merge!!!!

Message ID 20191101112509.29723-1-ribalda@kernel.org (mailing list archive)
State New, archived
Headers show
Series [1/4] HEADERS, do not merge!!!! | expand

Commit Message

Ricardo Ribalda Delgado Nov. 1, 2019, 11:25 a.m. UTC 
---
 contrib/freebsd/include/linux/videodev2.h | 1 +
 include/linux/videodev2.h                 | 1 +
 2 files changed, 2 insertions(+)
diff mbox series

Patch

diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h
index 85fa80f7..e90c8912 100644
--- a/contrib/freebsd/include/linux/videodev2.h
+++ b/contrib/freebsd/include/linux/videodev2.h
@@ -1713,6 +1713,7 @@  struct v4l2_ext_control {
 		uint16_t *p_u16;
 		uint32_t *p_u32;
 		void *ptr;
+		struct v4l2_area *p_area;
 	};
 } __attribute__ ((packed));
 
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 6d66a789..7bafe5cd 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1678,6 +1678,7 @@  struct v4l2_ext_control {
 		__u8 *p_u8;
 		__u16 *p_u16;
 		__u32 *p_u32;
+		struct v4l2_area *p_area;
 		void *ptr;
 	};
 } __attribute__ ((packed));