projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6-block.git]
/
drivers
/
video
/
Kconfig
diff --git
a/drivers/video/Kconfig
b/drivers/video/Kconfig
index b6c0239d8d29c8f90557c37fb9713efa29eb39d8..2b5a691064b719fcfa94fdb4bcac82bf0fb26205 100644
(file)
--- a/
drivers/video/Kconfig
+++ b/
drivers/video/Kconfig
@@
-2006,7
+2006,7
@@
config FB_PS3_DEFAULT_SIZE_M
config FB_XILINX
tristate "Xilinx frame buffer support"
- depends on FB &&
XILINX_VIRTEX
+ depends on FB &&
(XILINX_VIRTEX || MICROBLAZE)
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT