1 files changed, 7 insertions, 9 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index b8f0a11e8f31..7f5a59836818 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -677,8 +677,6 @@ config FB_S1D13XXX
 config FB_NVIDIA
         tristate "nVidia Framebuffer Support"
         depends on FB && PCI
-        select I2C_ALGOBIT if FB_NVIDIA_I2C
-        select I2C if FB_NVIDIA_I2C
         select FB_BACKLIGHT if FB_NVIDIA_BACKLIGHT
         select FB_MODE_HELPERS
         select FB_CFB_FILLRECT
@@ -697,6 +695,7 @@ config FB_NVIDIA
 config FB_NVIDIA_I2C
        bool "Enable DDC Support"
        depends on FB_NVIDIA
+       select FB_DDC
        help
           This enables I2C support for nVidia Chipsets.  This is used
           only for getting EDID information from the attached display
@@ -716,7 +715,6 @@ config FB_NVIDIA_BACKLIGHT
 config FB_RIVA
         tristate "nVidia Riva support"
         depends on FB && PCI
-        select FB_DDC if FB_RIVA_I2C
         select FB_BACKLIGHT if FB_RIVA_BACKLIGHT
         select FB_MODE_HELPERS
         select FB_CFB_FILLRECT
@@ -734,6 +732,7 @@ config FB_RIVA
 config FB_RIVA_I2C
        bool "Enable DDC Support"
        depends on FB_RIVA
+       select FB_DDC
        help
           This enables I2C support for nVidia Chipsets.  This is used
           only for getting EDID information from the attached display
@@ -812,8 +811,6 @@ config FB_INTEL
         depends on FB && EXPERIMENTAL && PCI && X86
         select AGP
         select AGP_INTEL
-        select I2C_ALGOBIT if FB_INTEL_I2C
-        select I2C if FB_INTEL_I2C
         select FB_MODE_HELPERS
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
@@ -846,6 +843,7 @@ config FB_INTEL_DEBUG
 config FB_INTEL_I2C
         bool "DDC/I2C for Intel framebuffer support"
         depends on FB_INTEL
+        select FB_DDC
         default y
         help
           Say Y here if you want DDC/I2C support for your on-board Intel graphics.
@@ -924,8 +922,8 @@ config FB_MATROX_G
 
 config FB_MATROX_I2C
         tristate "Matrox I2C support"
-        depends on FB_MATROX && I2C
-        select I2C_ALGOBIT
+        depends on FB_MATROX
+        select FB_DDC
         ---help---
           This drivers creates I2C buses which are needed for accessing the
           DDC (I2C) bus present on all Matroxes, an I2C bus which
@@ -993,7 +991,6 @@ config FB_MATROX_MULTIHEAD
 config FB_RADEON
         tristate "ATI Radeon display support"
         depends on FB && PCI
-        select FB_DDC if FB_RADEON_I2C
         select FB_BACKLIGHT if FB_RADEON_BACKLIGHT
         select FB_MODE_HELPERS
         select FB_CFB_FILLRECT
@@ -1018,6 +1015,7 @@ config FB_RADEON
 config FB_RADEON_I2C
         bool "DDC/I2C for ATI Radeon support"
         depends on FB_RADEON
+        select FB_DDC
         default y
         help
           Say Y here if you want DDC/I2C support for your Radeon board. 
@@ -1125,7 +1123,6 @@ config FB_S3
 config FB_SAVAGE
         tristate "S3 Savage support"
         depends on FB && PCI && EXPERIMENTAL
-        select FB_DDC if FB_SAVAGE_I2C
         select FB_MODE_HELPERS
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
@@ -1142,6 +1139,7 @@ config FB_SAVAGE
 config FB_SAVAGE_I2C
        bool "Enable DDC2 Support"
        depends on FB_SAVAGE
+       select FB_DDC
        help
           This enables I2C support for S3 Savage Chipsets.  This is used
           only for getting EDID information from the attached display