summaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-tpg.h
diff options
context:
space:
mode:
authorHelen Mae Koike Fornazier <helen.koike@collabora.co.uk>2016-04-08 22:28:58 +0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-04-20 21:14:39 +0200
commite07d46e7e0da86c146f199dae76f879096bc436a (patch)
tree0af2dedf71fa594cf7062b86548289f376575e31 /include/media/v4l2-tpg.h
parent[media] vivid: use new v4l2-rect.h header (diff)
downloadlinux-e07d46e7e0da86c146f199dae76f879096bc436a.tar.xz
linux-e07d46e7e0da86c146f199dae76f879096bc436a.zip
[media] tpg: Export the tpg code from vivid as a module
The test pattern generator will be used by other drivers as the virtual media controller (vimc) Signed-off-by: Helen Mae Koike Fornazier <helen.koike@collabora.co.uk> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to '')
-rw-r--r--include/media/v4l2-tpg.h (renamed from drivers/media/platform/vivid/vivid-tpg.h)9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/platform/vivid/vivid-tpg.h b/include/media/v4l2-tpg.h
index 93fbaee69675..329bebfa930c 100644
--- a/drivers/media/platform/vivid/vivid-tpg.h
+++ b/include/media/v4l2-tpg.h
@@ -1,5 +1,5 @@
/*
- * vivid-tpg.h - Test Pattern Generator
+ * v4l2-tpg.h - Test Pattern Generator
*
* Copyright 2014 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
*
@@ -17,8 +17,8 @@
* SOFTWARE.
*/
-#ifndef _VIVID_TPG_H_
-#define _VIVID_TPG_H_
+#ifndef _V4L2_TPG_H_
+#define _V4L2_TPG_H_
#include <linux/types.h>
#include <linux/errno.h>
@@ -26,8 +26,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/videodev2.h>
-
-#include "vivid-tpg-colors.h"
+#include <media/v4l2-tpg-colors.h>
enum tpg_pattern {
TPG_PAT_75_COLORBAR,