diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 7c305317f372fb7edb5986a51b86ba5fd41d0667..3a7a11a75fb464017ce284d34a41388f2875dd15 100644
--- a/drivers/of/Kconfig
+++ b/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/drivers/of/Makefile b/drivers/of/Makefile
index a07b95362c5387b2f24e76014a7077c1e07017a9..548772e871fd8e52a1ed66156fc0c129e84660af 100644
--- a/drivers/of/Makefile
+++ b/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/drivers/of/i2c.c b/drivers/of/of_i2c.c
similarity index 100%
rename from drivers/of/i2c.c
rename to drivers/of/of_i2c.c