summaryrefslogtreecommitdiffstats
path: root/drivers/video/Kconfig
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2013-06-28 18:01:28 +0800
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2013-06-28 18:01:28 +0800
commit19fd7441e9cc29b6c6d73c5469b3c93aa245fbb5 (patch)
treeab5e98ae677baecab3155b34983d97ffd08281c0 /drivers/video/Kconfig
parentb75bf98b5d2b7fdb876d3dd7eaec8246d4cc7174 (diff)
parent464d8a54a0ca7827a2278e2122e5eb22462ae044 (diff)
downloadop-kernel-dev-19fd7441e9cc29b6c6d73c5469b3c93aa245fbb5.zip
op-kernel-dev-19fd7441e9cc29b6c6d73c5469b3c93aa245fbb5.tar.gz
Merge tag 'fbdev-3.11-2' of git://gitorious.org/linux-omap-dss2/linux into fbdev/for-next
Various fbdev changes for 3.11 * xilinxfb updates * Small cleanups and fixes to multiple drivers
Diffstat (limited to 'drivers/video/Kconfig')
-rw-r--r--drivers/video/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 2e937bd..2c301f8 100644
--- 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
OpenPOWER on IntegriCloud