From: Jochen Friedrich Date: Fri, 18 Apr 2008 14:23:03 +0000 (+1000) Subject: [POWERPC] i2c: Fix build breakage introduced by OF helpers X-Git-Tag: v2.6.26-rc1~1125^2~3 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=585468e5d5962660867c269e26f0a4b89a599473;p=linux-2.6 [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 Signed-off-by: Paul Mackerras --- diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index 7c305317f3..3a7a11a75f 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 a07b95362c..548772e871 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