diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-10-09 06:02:25 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-12-18 12:28:35 -0500 |
| commit | 1beb623bdab53fb148b0ae4161b816e40ed16ca1 (patch) | |
| tree | 28a5b37591d7268925ac5e695759b4dbc7e33a4a /drivers/media/common | |
| parent | 9fbe71b4d8020221268e5c5b6fe02665b046d199 (diff) | |
media: v4l2-tpg*.h: move headers to include/media/tpg and merge them
The v4l2-tpg*.h headers are meant to be used only internally by
vivid and vimc. There's no sense keeping them together with the
V4L2 kAPI headers. Also, one header includes the other as they're
meant to be used together. So, merge them.
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/common')
| -rw-r--r-- | drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c | 2 | ||||
| -rw-r--r-- | drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c b/drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c index 5b5f95c38fe1..95b26f6a0d54 100644 --- a/drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c +++ b/drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c @@ -36,7 +36,7 @@ */ #include <linux/videodev2.h> -#include <media/v4l2-tpg-colors.h> +#include <media/tpg/v4l2-tpg.h> /* sRGB colors with range [0-255] */ const struct color tpg_colors[TPG_COLOR_MAX] = { diff --git a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c index f96968c11312..2b3d4ac4dfd4 100644 --- a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c +++ b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c @@ -21,7 +21,7 @@ */ #include <linux/module.h> -#include <media/v4l2-tpg.h> +#include <media/tpg/v4l2-tpg.h> /* Must remain in sync with enum tpg_pattern */ const char * const tpg_pattern_strings[] = { |