summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-21 14:40:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-21 14:40:30 -0700
commitec2a7587e0a91d5c1afe23a0a73edfce06c5e4e0 (patch)
treefff1da958ffca4d0b17b58ac5bbe22fa486ca106 /drivers
parentda7806f9b0579a1150f01ade3b562e543ddcbf2c (diff)
parentda6df07794d92cd159e28e2cb1947d8b33913e2f (diff)
Merge branch 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
* 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm: drivers: video: msm: add include msm_mdp.h drivers: video: msm: default to no
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index fd55c279915c..1e6fec487973 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2202,7 +2202,6 @@ config FB_MSM
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
- default y
config FB_MX3
tristate "MX3 Framebuffer support"