summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-18 16:44:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-18 16:44:47 -0700
commit7de4a9a73563e5f6f3c153015fadee433a443241 (patch)
treed70e27c20bc612c58ec123e581f2ce7c02553888 /drivers/video
parent1097d7cef683c30f9768007daae2e961a0686a10 (diff)
parentf04e879bf296d136bcafd8c5a26e95599b141671 (diff)
downloadlinux-7de4a9a73563e5f6f3c153015fadee433a443241.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sunxvr1000: Add missing FB=y depenency. MAINTAINERS: Add entry for sparc serial drivers. drivers/serial/sunsab.c: adjust the constant used to initialize the interrupt_mask0 fields
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index dabe804ba575..feaff4f04b58 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -914,7 +914,7 @@ config FB_XVR2500
config FB_XVR1000
bool "Sun XVR-1000 support"
- depends on SPARC64
+ depends on (FB = y) && SPARC64
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT