Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel

1 files changed, 4 insertions, 19 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 93258e11451..8083d862ebc 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1128,13 +1128,6 @@ config FB_INTEL
           830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets.
           Say Y if you have and plan to use such a board.
 
-          If you say Y here and want DDC/I2C support you must first say Y to
-          "I2C support" and "I2C bit-banging support" in the character devices
-          section.
-
-          If you say M here then "I2C support" and "I2C bit-banging support"
-          can be build either as modules or built-in.
-
           To compile this driver as a module, choose M here: the
           module will be called intelfb.
 
@@ -1207,11 +1200,10 @@ config FB_MATROX_G
           pixel and 32 bpp packed pixel. You can also use font widths
           different from 8.
 
-          If you need support for G400 secondary head, you must first say Y to
-          "I2C support" in the character devices section, and then to
-          "Matrox I2C support" and "G400 second head support" here in the
-          framebuffer section. G450/G550 secondary head and digital output
-          are supported without additional modules.
+          If you need support for G400 secondary head, you must say Y to
+          "Matrox I2C support" and "G400 second head support" right below.
+          G450/G550 secondary head and digital output are supported without
+          additional modules.
 
           The driver starts in monitor mode. You must use the matroxset tool 
           (available at <ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/>) to 
@@ -1310,13 +1302,6 @@ config FB_RADEON
           a framebuffer device.  There are both PCI and AGP versions.  You
           don't need to choose this to run the Radeon in plain VGA mode.
 
-          If you say Y here and want DDC/I2C support you must first say Y to
-          "I2C support" and "I2C bit-banging support" in the character devices
-          section.
-
-          If you say M here then "I2C support" and "I2C bit-banging support" 
-          can be build either as modules or built-in.
-
           There is a product page at
           http://apps.ati.com/ATIcompare/