aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/vimc
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2017-10-09 06:02:25 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-12-18 12:28:35 -0500
commit1beb623bdab53fb148b0ae4161b816e40ed16ca1 (patch)
tree28a5b37591d7268925ac5e695759b4dbc7e33a4a /drivers/media/platform/vimc
parentmedia: vb2: add cross references at memops and v4l2 kernel-doc markups (diff)
downloadlinux-dev-1beb623bdab53fb148b0ae4161b816e40ed16ca1.tar.xz
linux-dev-1beb623bdab53fb148b0ae4161b816e40ed16ca1.zip
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/platform/vimc')
-rw-r--r--drivers/media/platform/vimc/vimc-sensor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/vimc/vimc-sensor.c b/drivers/media/platform/vimc/vimc-sensor.c
index ca1c52232d1e..457e211514c6 100644
--- a/drivers/media/platform/vimc/vimc-sensor.c
+++ b/drivers/media/platform/vimc/vimc-sensor.c
@@ -24,7 +24,7 @@
#include <linux/vmalloc.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-subdev.h>
-#include <media/v4l2-tpg.h>
+#include <media/tpg/v4l2-tpg.h>
#include "vimc-common.h"