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
This commit is contained in:
Linus Torvalds 2009-12-11 20:46:51 -08:00
commit c4e194e3b7
12 changed files with 209 additions and 12 deletions

View file

@ -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