From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jochen Friedrich Subject: [PATCH] [POWERPC] i2c: fix build breakage introduced by OF helpers Date: Fri, 18 Apr 2008 16:23:03 +0200 Message-ID: <4808AEC7.8040000@scram.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: i2c-bounces-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org Errors-To: i2c-bounces-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org To: Kumar Gala Cc: Stephen Rothwell , linuxppc-dev list , "Kernel, Linux" , Scott Wood , Paul Mackerras , David Miller , Linux I2C List-Id: linux-i2c@vger.kernel.org Fix build breakage introduced in commit "[POWERPC] i2c: OF helpers for the i2c API". If i2c-core is compiled as module, the helper needs to be compiled as module, as well. Rename i2c.c to of_i2c.c to avoid name space conflict. Signed-off-by: Jochen Friedrich --- drivers/of/Kconfig | 2 +- drivers/of/Makefile | 2 +- drivers/of/{i2c.c => of_i2c.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename drivers/of/{i2c.c => of_i2c.c} (100%) diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index 7c30531..0e39f00 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 + def_tristate I2C depends on OF && I2C help OpenFirmware I2C accessors diff --git a/drivers/of/Makefile b/drivers/of/Makefile index a07b953..548772e 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 -- 1.5.5 _______________________________________________ i2c mailing list i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org http://lists.lm-sensors.org/mailman/listinfo/i2c