diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-06-28 06:01:28 -0400 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-06-28 06:01:28 -0400 |
| commit | 19fd7441e9cc29b6c6d73c5469b3c93aa245fbb5 (patch) | |
| tree | ab5e98ae677baecab3155b34983d97ffd08281c0 /drivers/video/Kconfig | |
| parent | b75bf98b5d2b7fdb876d3dd7eaec8246d4cc7174 (diff) | |
| parent | 464d8a54a0ca7827a2278e2122e5eb22462ae044 (diff) | |
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/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 2e937bdace6f..2c301f8441e9 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -2188,7 +2188,7 @@ config FB_PS3_DEFAULT_SIZE_M | |||
| 2188 | 2188 | ||
| 2189 | config FB_XILINX | 2189 | config FB_XILINX |
| 2190 | tristate "Xilinx frame buffer support" | 2190 | tristate "Xilinx frame buffer support" |
| 2191 | depends on FB && (XILINX_VIRTEX || MICROBLAZE) | 2191 | depends on FB && (XILINX_VIRTEX || MICROBLAZE || ARCH_ZYNQ) |
| 2192 | select FB_CFB_FILLRECT | 2192 | select FB_CFB_FILLRECT |
| 2193 | select FB_CFB_COPYAREA | 2193 | select FB_CFB_COPYAREA |
| 2194 | select FB_CFB_IMAGEBLIT | 2194 | select FB_CFB_IMAGEBLIT |