Merge tag 'v3.10' into master-next

[vajnamar/linux-xlnx.git] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 2e937bdace6f123a1b6f1c0c055b4422dde78875..398775650deacd3e70b363df9a9ef42828b0ea8b 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2188,7 +2188,7 @@ config FB_PS3_DEFAULT_SIZE_M
 
 config FB_XILINX
        tristate "Xilinx frame buffer support"
-       depends on FB && (XILINX_VIRTEX || MICROBLAZE)
+       depends on FB && (XILINX_VIRTEX || MICROBLAZE || ARCH_ZYNQ)
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -2470,6 +2470,7 @@ config FB_SIMPLE
          through device tree, or potentially plain old platform data in the
          future.
 
+source "drivers/video/xylon/Kconfig"
 source "drivers/video/omap/Kconfig"
 source "drivers/video/omap2/Kconfig"
 source "drivers/video/exynos/Kconfig"