From 1995efb7464766cf695246c6dde91dbb2cebc61b Mon Sep 17 00:00:00 2001
From: Christian Kohn <christian.kohn@xilinx.com>
Date: Mon, 23 Jun 2014 16:31:12 -0700
Subject: [PATCH] media: xilinx: Move and rename xilinx v4l2 controls header
 file

Rename the xilinx v4l2 controls header and move it to the UAPI
include directory so it gets exported when running
'make headers_install'. Fix all references to this file.

Signed-off-by: Christian Kohn <christian.kohn@xilinx.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 drivers/media/platform/xilinx/xilinx-cresample.c            | 2 +-
 drivers/media/platform/xilinx/xilinx-hls.c                  | 2 +-
 drivers/media/platform/xilinx/xilinx-rgb2yuv.c              | 2 +-
 drivers/media/platform/xilinx/xilinx-tpg.c                  | 2 +-
 include/uapi/linux/Kbuild                                   | 1 +
 .../uapi/linux/xilinx-v4l2-controls.h                       | 6 +++---
 6 files changed, 8 insertions(+), 7 deletions(-)
 rename drivers/media/platform/xilinx/xilinx-controls.h => include/uapi/linux/xilinx-v4l2-controls.h (97%)

diff --git a/drivers/media/platform/xilinx/xilinx-cresample.c b/drivers/media/platform/xilinx/xilinx-cresample.c
index c215492dd6eea4..692c511a4fd4c1 100644
--- a/drivers/media/platform/xilinx/xilinx-cresample.c
+++ b/drivers/media/platform/xilinx/xilinx-cresample.c
@@ -19,12 +19,12 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/xilinx-v4l2-controls.h>
 
 #include <media/v4l2-async.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-subdev.h>
 
-#include "xilinx-controls.h"
 #include "xilinx-vip.h"
 
 #define XCRESAMPLE_ENCODING			0x100
diff --git a/drivers/media/platform/xilinx/xilinx-hls.c b/drivers/media/platform/xilinx/xilinx-hls.c
index 6b6e270c6c0c83..79ae3ad92a2e7c 100644
--- a/drivers/media/platform/xilinx/xilinx-hls.c
+++ b/drivers/media/platform/xilinx/xilinx-hls.c
@@ -15,12 +15,12 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/xilinx-hls.h>
+#include <linux/xilinx-v4l2-controls.h>
 
 #include <media/v4l2-async.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-subdev.h>
 
-#include "xilinx-controls.h"
 #include "xilinx-vip.h"
 
 #define XHLS_DEF_WIDTH				1920
diff --git a/drivers/media/platform/xilinx/xilinx-rgb2yuv.c b/drivers/media/platform/xilinx/xilinx-rgb2yuv.c
index 275f8d4e17424f..8438494bfef4ba 100644
--- a/drivers/media/platform/xilinx/xilinx-rgb2yuv.c
+++ b/drivers/media/platform/xilinx/xilinx-rgb2yuv.c
@@ -19,12 +19,12 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/xilinx-v4l2-controls.h>
 
 #include <media/v4l2-async.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-subdev.h>
 
-#include "xilinx-controls.h"
 #include "xilinx-vip.h"
 
 #define XRGB2YUV_YMAX					0x100
diff --git a/drivers/media/platform/xilinx/xilinx-tpg.c b/drivers/media/platform/xilinx/xilinx-tpg.c
index e2d6407852d69f..1050e7c7694c8f 100644
--- a/drivers/media/platform/xilinx/xilinx-tpg.c
+++ b/drivers/media/platform/xilinx/xilinx-tpg.c
@@ -15,12 +15,12 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/xilinx-v4l2-controls.h>
 
 #include <media/v4l2-async.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-subdev.h>
 
-#include "xilinx-controls.h"
 #include "xilinx-vip.h"
 #include "xilinx-vtc.h"
 
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 7d42deb7e25ed0..a8bd03cc4704ad 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -426,6 +426,7 @@ header-y += x25.h
 header-y += xattr.h
 header-y += xfrm.h
 header-y += xilinx-hls.h
+header-y += xilinx-v4l2-controls.h
 header-y += hw_breakpoint.h
 header-y += zorro.h
 header-y += zorro_ids.h
diff --git a/drivers/media/platform/xilinx/xilinx-controls.h b/include/uapi/linux/xilinx-v4l2-controls.h
similarity index 97%
rename from drivers/media/platform/xilinx/xilinx-controls.h
rename to include/uapi/linux/xilinx-v4l2-controls.h
index 0bb533bba6fa40..6c98963e05131b 100644
--- a/drivers/media/platform/xilinx/xilinx-controls.h
+++ b/include/uapi/linux/xilinx-v4l2-controls.h
@@ -15,8 +15,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef __XILINX_CONTROLS_H__
-#define __XILINX_CONTROLS_H__
+#ifndef __UAPI_XILINX_V4L2_CONTROLS_H__
+#define __UAPI_XILINX_V4L2_CONTROLS_H__
 
 #include <linux/v4l2-controls.h>
 
@@ -124,4 +124,4 @@
 /* The IP model */
 #define V4L2_CID_XILINX_HLS_MODEL		(V4L2_CID_XILINX_HLS + 1)
 
-#endif /* __XILINX_CONTROLS_H__ */
+#endif /* __UAPI_XILINX_V4L2_CONTROLS_H__ */