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

diff --combined drivers/video/Kconfig
index fd55c27,87f36ef..1e6fec4
--- 1/drivers/video/Kconfig
--- 2/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@@ -1511,7 -1511,6 +1511,7 @@@ config FB_VI
         select FB_CFB_IMAGEBLIT
         select I2C_ALGOBIT
         select I2C
 +       select GPIOLIB
         help
          This is the frame buffer device driver for Graphics chips of VIA
          UniChrome (Pro) Family (CLE266,PM800/CN400,P4M800CE/P4M800Pro/
@@@ -1521,21 -1520,6 +1521,21 @@@
  
          To compile this driver as a module, choose M here: the
          module will be called viafb.
 +
 +if FB_VIA
 +
 +config FB_VIA_DIRECT_PROCFS
 +      bool "direct hardware access via procfs (DEPRECATED)(DANGEROUS)"
 +      depends on FB_VIA
 +      default n
 +      help
 +        Allow direct hardware access to some output registers via procfs.
 +        This is dangerous but may provide the only chance to get the
 +        correct output device configuration.
 +        Its use is strongly discouraged.
 +
 +endif
 +
  config FB_NEOMAGIC
        tristate "NeoMagic display support"
        depends on FB && PCI
@@@ -2202,7 -2186,6 +2202,6 @@@ config FB_MS
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
-       default y
  
  config FB_MX3
        tristate "MX3 Framebuffer support"