--- drivers/video/Kconfig.orig	2004-10-16 11:58:32.738491881 -0400
+++ drivers/video/Kconfig	2004-10-16 12:24:54.896505429 -0400
@@ -428,8 +428,6 @@
 config FB_RIVA
 	tristate "nVidia Riva support"
 	depends on FB && PCI
-	select I2C_ALGOBIT if FB_RIVA_I2C
-	select I2C if FB_RIVA_I2C
 	select FB_MODE_HELPERS
 	help
 	  This driver supports graphics boards with the nVidia Riva/Geforce
@@ -441,7 +439,7 @@
 
 config FB_RIVA_I2C
        bool "Enable DDC Support"
-       depends on FB_RIVA
+       depends on FB_RIVA && I2C && I2C_ALGOBIT
        help
 	  This enables I2C support for nVidia Chipsets.  This is used
 	  only for getting EDID information from the attached display
@@ -451,6 +449,9 @@
 	  independently validate video mode parameters, you should say Y
 	  here.
 
+comment "You must enable I2C and I2C_ALGOBIT for nVidia Riva DDC Support."
+	depends on !(I2C && I2C_ALGOBIT) && FB_RIVA
+
 config FB_RIVA_DEBUG
 	bool "Lots of debug output from Riva(nVidia) driver"
 	depends on FB_RIVA