1 files changed, 15 insertions, 7 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 6372f8b17b45..fb19803060cf 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -41,7 +41,7 @@ menuconfig FB
           You need an utility program called fbset to make full use of frame
           buffer devices. Please read <file:Documentation/fb/framebuffer.txt>
           and the Framebuffer-HOWTO at
-          <http://www.tahallah.demon.co.uk/programming/prog.html> for more
+          <http://www.munted.org.uk/programming/Framebuffer-HOWTO-1.2.html> for more
           information.
 
           Say Y here and to the driver for your graphics board below if you
@@ -1054,9 +1054,7 @@ config FB_RIVA_BACKLIGHT
 
 config FB_I810
         tristate "Intel 810/815 support (EXPERIMENTAL)"
-        depends on FB && EXPERIMENTAL && PCI && X86_32
-        select AGP
-        select AGP_INTEL
+        depends on EXPERIMENTAL && FB && PCI && X86_32 && AGP_INTEL
         select FB_MODE_HELPERS
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
@@ -1119,9 +1117,7 @@ config FB_CARILLO_RANCH
 
 config FB_INTEL
         tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)"
-        depends on FB && EXPERIMENTAL && PCI && X86
-        select AGP
-        select AGP_INTEL
+        depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL
         select FB_MODE_HELPERS
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
@@ -2123,6 +2119,18 @@ config FB_PRE_INIT_FB
           Select this option if display contents should be inherited as set by
           the bootloader.
 
+config FB_MX3
+       tristate "MX3 Framebuffer support"
+       depends on FB && MX3_IPU
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       default y
+       help
+         This is a framebuffer device for the i.MX31 LCD Controller. So
+         far only synchronous displays are supported. If you plan to use
+         an LCD display with your i.MX31 system, say Y here.
+
 source "drivers/video/omap/Kconfig"
 
 source "drivers/video/backlight/Kconfig"