Merge gregkh@kernel.bkbits.net:linux/i2c-2.5

into kroah.com:/home/linux/BK/i2c-2.5

drivers/i2c/Kconfig

@@ -20,9 +20,7 @@ config I2C
 	  interfaces", below.
 
 	  If you want I2C support, you should say Y here and also to the
-	  specific driver for your bus adapter(s) below.  If you say Y to
-	  "/proc file system" below, you will then get a /proc interface which
-	  is documented in <file:Documentation/i2c/proc-interface>.
+	  specific driver for your bus adapter(s) below.
 
 	  This I2C support is also available as a module.  If you want to
 	  compile it as a module, say M here and read