commit | af127144eb8a0a0c0c1815b0ad98c08fa4b89ef2 | [log] [tgz] |
---|---|---|
author | Ricardo Ribalda <[email protected]> | Wed Nov 20 18:38:58 2024 +0000 |
committer | Ricardo Ribalda <[email protected]> | Thu Dec 05 22:30:50 2024 +0000 |
tree | fc95945c9584d0f284631a347ce5e501c36710e7 | |
parent | a9f3b4313ff478811089d8194e28877a09274bff [diff] |
media-ctl: Remove duplicated include The local file v4l2subdev.h seems to be included twice. And one of them using <> instead of "". Bug: 379901025 Test: m media-ctl v4l2-ctl v4l2-compliance Already merged upstream: https://git.linuxtv.org/v4l-utils.git/commit/?id=a270387157bf1c77e122afc228df50de9755 Change-Id: Iabd3e0f6922b403b2d57515899153b34c2c8865b Signed-off-by: Ricardo Ribalda <[email protected]> Signed-off-by: Hans Verkuil <[email protected]> [hverkuil: add include for v4l2-subdev.h to options.h]
diff --git a/utils/media-ctl/options.c b/utils/media-ctl/options.c index 515d64e..7ac7db9 100644 --- a/utils/media-ctl/options.c +++ b/utils/media-ctl/options.c
@@ -28,7 +28,6 @@ #include <string.h> #include <sys/ioctl.h> #include <unistd.h> -#include <v4l2subdev.h> #include <linux/media.h> #include <linux/videodev2.h>
diff --git a/utils/media-ctl/options.h b/utils/media-ctl/options.h index 095729b..470343e 100644 --- a/utils/media-ctl/options.h +++ b/utils/media-ctl/options.h
@@ -22,6 +22,8 @@ #ifndef __OPTIONS_H #define __OPTIONS_H +#include <linux/v4l2-subdev.h> + struct media_options { const char *devname;