[media] media: platform: pxa_camera: move pxa_camera out of soc_camera

As the conversion to a v4l2 standalone device is finished, move
pxa_camera one directory up and finish severing any dependency to
soc_camera.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

5 files changed, 9 insertions, 9 deletions

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 124098560d02..66cf1a857825 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -91,6 +91,14 @@ config VIDEO_OMAP3_DEBUG
         ---help---
           Enable debug messages on OMAP 3 camera controller driver.
 
+config VIDEO_PXA27x
+        tristate "PXA27x Quick Capture Interface driver"
+        depends on VIDEO_DEV && PXA27x && HAS_DMA
+        select VIDEOBUF2_DMA_SG
+        select SG_SPLIT
+        ---help---
+          This is a v4l2 driver for the PXA27x Quick Capture Interface
+
 config VIDEO_S3C_CAMIF
         tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver"
         depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index b4ee8aaf6d88..c645a50bea5e 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/
 obj-$(CONFIG_VIDEO_MMP_CAMERA) += marvell-ccic/
 
 obj-$(CONFIG_VIDEO_OMAP3)       += omap3isp/
+obj-$(CONFIG_VIDEO_PXA27x)      += pxa_camera.o soc_camera/soc_mediabus.o
 
 obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o
 
diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/pxa_camera.c
index 868c6ad4784c..868c6ad4784c 100644
--- a/drivers/media/platform/soc_camera/pxa_camera.c
+++ b/drivers/media/platform/pxa_camera.c
diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig
index 6b87b3a9d546..8b046dc49392 100644
--- a/drivers/media/platform/soc_camera/Kconfig
+++ b/drivers/media/platform/soc_camera/Kconfig
@@ -17,14 +17,6 @@ config SOC_CAMERA_PLATFORM
         help
           This is a generic SoC camera platform driver, useful for testing
 
-config VIDEO_PXA27x
-        tristate "PXA27x Quick Capture Interface driver"
-        depends on VIDEO_DEV && PXA27x && HAS_DMA
-        select VIDEOBUF2_DMA_SG
-        select SG_SPLIT
-        ---help---
-          This is a v4l2 driver for the PXA27x Quick Capture Interface
-
 config VIDEO_RCAR_VIN_OLD
         tristate "R-Car Video Input (VIN) support (DEPRECATED)"
         depends on VIDEO_DEV && SOC_CAMERA
diff --git a/drivers/media/platform/soc_camera/Makefile b/drivers/media/platform/soc_camera/Makefile
index ee8f9a4ae2a4..e189870a333d 100644
--- a/drivers/media/platform/soc_camera/Makefile
+++ b/drivers/media/platform/soc_camera/Makefile
@@ -7,6 +7,5 @@ obj-$(CONFIG_SOC_CAMERA_PLATFORM)	+= soc_camera_platform.o
 
 # soc-camera host drivers have to be linked after camera drivers
 obj-$(CONFIG_VIDEO_ATMEL_ISI)           += atmel-isi.o
-obj-$(CONFIG_VIDEO_PXA27x)              += pxa_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)       += sh_mobile_ceu_camera.o
 obj-$(CONFIG_VIDEO_RCAR_VIN_OLD)        += rcar_vin.o