vcap: move msm vcap driver to drivers/media/platform/msm
In newer versions of the Linux kernel the drivers/media/video directory
has been removed. To prepare for this change, move the msm vcap
driver to a location compatible with the future directory structure.
Signed-off-by: Steve Muckle <smuckle@codeaurora.org>
diff --git a/drivers/media/platform/msm/Kconfig b/drivers/media/platform/msm/Kconfig
index ab0c7a2..fa4b8b6 100644
--- a/drivers/media/platform/msm/Kconfig
+++ b/drivers/media/platform/msm/Kconfig
@@ -44,3 +44,4 @@
source "drivers/media/platform/msm/vidc/Kconfig"
source "drivers/media/platform/msm/wfd/Kconfig"
+source "drivers/media/platform/msm/vcap/Kconfig"
diff --git a/drivers/media/platform/msm/Makefile b/drivers/media/platform/msm/Makefile
index 5f83de0..e02447a 100644
--- a/drivers/media/platform/msm/Makefile
+++ b/drivers/media/platform/msm/Makefile
@@ -2,3 +2,4 @@
obj-$(CONFIG_MSM_WFD) += wfd/
obj-$(CONFIG_MSM_CAMERA) += camera_v1/
obj-$(CONFIG_MSMB_CAMERA) += camera_v2/
+obj-y += vcap/
diff --git a/drivers/media/platform/msm/vcap/Kconfig b/drivers/media/platform/msm/vcap/Kconfig
new file mode 100644
index 0000000..2bdcfbd
--- /dev/null
+++ b/drivers/media/platform/msm/vcap/Kconfig
@@ -0,0 +1,7 @@
+config MSM_VCAP
+ tristate "Qualcomm MSM VCAP"
+ depends on VIDEO_DEV && VIDEO_V4L2
+ default y
+ ---help---
+ Enables VCAP driver. This device allows for video capture and
+ video processing using the v4l2 api
diff --git a/drivers/media/platform/msm/vcap/Makefile b/drivers/media/platform/msm/vcap/Makefile
new file mode 100644
index 0000000..b9c6e4c
--- /dev/null
+++ b/drivers/media/platform/msm/vcap/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_MSM_VCAP) += vcap_v4l2.o
+obj-$(CONFIG_MSM_VCAP) += vcap_vc.o
+obj-$(CONFIG_MSM_VCAP) += vcap_vp.o
diff --git a/drivers/media/video/vcap_v4l2.c b/drivers/media/platform/msm/vcap/vcap_v4l2.c
similarity index 100%
rename from drivers/media/video/vcap_v4l2.c
rename to drivers/media/platform/msm/vcap/vcap_v4l2.c
diff --git a/drivers/media/video/vcap_vc.c b/drivers/media/platform/msm/vcap/vcap_vc.c
similarity index 100%
rename from drivers/media/video/vcap_vc.c
rename to drivers/media/platform/msm/vcap/vcap_vc.c
diff --git a/drivers/media/video/vcap_vc.h b/drivers/media/platform/msm/vcap/vcap_vc.h
similarity index 100%
rename from drivers/media/video/vcap_vc.h
rename to drivers/media/platform/msm/vcap/vcap_vc.h
diff --git a/drivers/media/video/vcap_vp.c b/drivers/media/platform/msm/vcap/vcap_vp.c
similarity index 100%
rename from drivers/media/video/vcap_vp.c
rename to drivers/media/platform/msm/vcap/vcap_vp.c
diff --git a/drivers/media/video/vcap_vp.h b/drivers/media/platform/msm/vcap/vcap_vp.h
similarity index 100%
rename from drivers/media/video/vcap_vp.h
rename to drivers/media/platform/msm/vcap/vcap_vp.h
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 9697a03..a722a79 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -639,14 +639,6 @@
Say Y here if you want to test video apps or debug V4L devices.
In doubt, say N.
-config MSM_VCAP
- tristate "Qualcomm MSM VCAP"
- depends on VIDEO_DEV && VIDEO_V4L2
- default y
- ---help---
- Enables VCAP driver. This device allows for video capture and
- video processing using the v4l2 api
-
#
# USB Multimedia device configuration
#
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index cfd6e15..1807467 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -170,9 +170,6 @@
obj-$(CONFIG_VIDEO_MEM2MEM_TESTDEV) += mem2mem_testdev.o
obj-$(CONFIG_VIDEO_CX23885) += cx23885/
-obj-$(CONFIG_MSM_VCAP) += vcap_v4l2.o
-obj-$(CONFIG_MSM_VCAP) += vcap_vc.o
-obj-$(CONFIG_MSM_VCAP) += vcap_vp.o
obj-$(CONFIG_VIDEO_AK881X) += ak881x.o
obj-$(CONFIG_VIDEO_OMAP2) += omap2cam.o