diff --git a/[refs] b/[refs]
index 78365dacf586..899f2174d368 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f264be6101c42cb9e471c58322fb83a5cde1461
+refs/heads/master: 585468e5d5962660867c269e26f0a4b89a599473
diff --git a/trunk/drivers/of/Kconfig b/trunk/drivers/of/Kconfig
index 7c305317f372..3a7a11a75fb4 100644
--- a/trunk/drivers/of/Kconfig
+++ b/trunk/drivers/of/Kconfig
@@ -9,7 +9,7 @@ config OF_GPIO
 	  OpenFirmware GPIO accessors
 
 config OF_I2C
-	def_bool y
-	depends on OF && I2C
+	def_tristate I2C
+	depends on PPC_OF && I2C
 	help
 	  OpenFirmware I2C accessors
diff --git a/trunk/drivers/of/Makefile b/trunk/drivers/of/Makefile
index a07b95362c53..548772e871fd 100644
--- a/trunk/drivers/of/Makefile
+++ b/trunk/drivers/of/Makefile
@@ -1,4 +1,4 @@
 obj-y = base.o
 obj-$(CONFIG_OF_DEVICE) += device.o platform.o
 obj-$(CONFIG_OF_GPIO)   += gpio.o
-obj-$(CONFIG_OF_I2C)	+= i2c.o
+obj-$(CONFIG_OF_I2C)	+= of_i2c.o
diff --git a/trunk/drivers/of/i2c.c b/trunk/drivers/of/of_i2c.c
similarity index 100%
rename from trunk/drivers/of/i2c.c
rename to trunk/drivers/of/of_i2c.c