From: Ricardo Ribalda Delgado <ribalda@kernel.org>
To: Hans Verkuil <hverkuil-cisco@xs4all.nl>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Ricardo Ribalda Delgado <ribalda@kernel.org>
Subject: [PATCH 1/4] HEADERS, do not merge!!!!
Date: Fri, 1 Nov 2019 12:25:06 +0100 [thread overview]
Message-ID: <20191101112509.29723-1-ribalda@kernel.org> (raw)
---
contrib/freebsd/include/linux/videodev2.h | 1 +
include/linux/videodev2.h | 1 +
2 files changed, 2 insertions(+)
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));
--
2.24.0.rc1
next reply other threads:[~2019-11-01 11:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-01 11:25 Ricardo Ribalda Delgado [this message]
2019-11-01 11:25 ` [PATCH 2/4] v4l2-ctl: Support query V4L2_CTRL_TYPE_AREA controls Ricardo Ribalda Delgado
2019-11-01 11:25 ` [PATCH 3/4] v4l2-ctl: Support getting " Ricardo Ribalda Delgado
2019-11-01 11:25 ` [PATCH 4/4] v4l2-ctl: Support setting " Ricardo Ribalda Delgado
2019-11-04 9:41 ` Hans Verkuil
2019-11-04 11:21 ` Ricardo Ribalda Delgado
2019-11-04 11:52 ` Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191101112509.29723-1-ribalda@kernel.org \
--to=ribalda@kernel.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).