summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJochen Friedrich <jochen@scram.de>2008-04-19 00:23:03 +1000
committerPaul Mackerras <paulus@samba.org>2008-04-20 13:03:35 +1000
commit585468e5d5962660867c269e26f0a4b89a599473 (patch)
tree0d134c3d7e7fb80e2f36c342983b9e224e325fca
parent9f264be6101c42cb9e471c58322fb83a5cde1461 (diff)
downloadlinux-585468e5d5962660867c269e26f0a4b89a599473.tar.bz2
[POWERPC] i2c: Fix build breakage introduced by OF helpers
Fix build breakage introduced in commit "[POWERPC] i2c: OF helpers for the i2c API". If i2c-core is compiled as a module, the helper needs to be compiled as a module, as well. Rename i2c.c to of_i2c.c to avoid name space conflict. [paulus@samba.org: Changed dependency from OF to PPC_OF to avoid sparc{32,64} allmodconfig breakage.] Signed-off-by: Jochen Friedrich <jochen@scram.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--drivers/of/Kconfig4
-rw-r--r--drivers/of/Makefile2
-rw-r--r--drivers/of/of_i2c.c (renamed from drivers/of/i2c.c)0
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 7c305317f372..3a7a11a75fb4 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 a07b95362c53..548772e871fd 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
index 631689171159..631689171159 100644
--- a/drivers/of/i2c.c
+++ b/drivers/of/of_i2c.c