Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[safe/jmp/linux-2.6] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 22c1662..1e6fec4 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1522,6 +1522,20 @@ config FB_VIA
          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
@@ -2188,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"