diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 17:40:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 17:40:30 -0400 |
| commit | ec2a7587e0a91d5c1afe23a0a73edfce06c5e4e0 (patch) | |
| tree | fff1da958ffca4d0b17b58ac5bbe22fa486ca106 /drivers/video/Kconfig | |
| parent | da7806f9b0579a1150f01ade3b562e543ddcbf2c (diff) | |
| parent | da6df07794d92cd159e28e2cb1947d8b33913e2f (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/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 1 |
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 | |||
| 2202 | select FB_CFB_FILLRECT | 2202 | select FB_CFB_FILLRECT |
| 2203 | select FB_CFB_COPYAREA | 2203 | select FB_CFB_COPYAREA |
| 2204 | select FB_CFB_IMAGEBLIT | 2204 | select FB_CFB_IMAGEBLIT |
| 2205 | default y | ||
| 2206 | 2205 | ||
| 2207 | config FB_MX3 | 2206 | config FB_MX3 |
| 2208 | tristate "MX3 Framebuffer support" | 2207 | tristate "MX3 Framebuffer support" |