summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-12 07:46:51 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-12 07:46:51 +0300
commitc4e194e3b71ff4fed01d727c32ee1071921d28a3 (patch)
treef3d237e46ee08c15693e14c15ed1f93c1946c560 /drivers/video
parent2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff)
parent3989d17847071fa94c93299805a9cca27cf65d26 (diff)
downloadlinux-c4e194e3b71ff4fed01d727c32ee1071921d28a3.tar.xz
Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
* 'for-linus' of git://codeaurora.org/quic/kernel/dwalker/linux-msm: HTC Dream: mmc compilation fixes video: Allow selecting MSM framebuffer in Kconfig Add arm msm maintainer entry msm: Add memory map for HTC Dream msm: add minimal board file for HTC Dream device msm: make debugging UART (for DEBUG_LL) configurable
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 bb5fbed89e7f..99c0df1c7ebf 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2131,7 +2131,7 @@ config FB_PRE_INIT_FB
the bootloader.
config FB_MSM
- tristate
+ tristate "MSM Framebuffer support"
depends on FB && ARCH_MSM
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA