media: platform: Sync with mainline

Syncup location with mainline.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 2b80be1b994b32e1de1fb11adb8bd1c716fab0ee..ce4a96fccc433c69269a14455ba94e053b515d91 100644 (file)
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -116,8 +116,8 @@ config VIDEO_S3C_CAMIF
 
 source "drivers/media/platform/soc_camera/Kconfig"
 source "drivers/media/platform/exynos4-is/Kconfig"
-source "drivers/media/platform/xilinx/Kconfig"
 source "drivers/media/platform/am437x/Kconfig"
+source "drivers/media/platform/xilinx/Kconfig"
 source "drivers/media/platform/rcar-vin/Kconfig"
 source "drivers/media/platform/atmel/Kconfig"
 

diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 6a8b22094df1d7bc48c3fa4483e245e51a890054..40b18d12726ec52d0acfd15894337366eb420e89 100644 (file)
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -53,8 +53,6 @@ obj-$(CONFIG_VIDEO_RENESAS_VSP1)      += vsp1/
 
 obj-y  += omap/
 
-obj-$(CONFIG_VIDEO_XILINX)             += xilinx/
-
 obj-$(CONFIG_VIDEO_AM437X_VPFE)                += am437x/
 
 obj-$(CONFIG_VIDEO_XILINX)             += xilinx/