diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 19:44:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 19:44:47 -0400 |
| commit | 7de4a9a73563e5f6f3c153015fadee433a443241 (patch) | |
| tree | d70e27c20bc612c58ec123e581f2ce7c02553888 /drivers/video | |
| parent | 1097d7cef683c30f9768007daae2e961a0686a10 (diff) | |
| parent | f04e879bf296d136bcafd8c5a26e95599b141671 (diff) | |
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/Kconfig | 2 |
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 | |||
| 914 | 914 | ||
| 915 | config FB_XVR1000 | 915 | config FB_XVR1000 |
| 916 | bool "Sun XVR-1000 support" | 916 | bool "Sun XVR-1000 support" |
| 917 | depends on SPARC64 | 917 | depends on (FB = y) && SPARC64 |
| 918 | select FB_CFB_FILLRECT | 918 | select FB_CFB_FILLRECT |
| 919 | select FB_CFB_COPYAREA | 919 | select FB_CFB_COPYAREA |
| 920 | select FB_CFB_IMAGEBLIT | 920 | select FB_CFB_IMAGEBLIT |