From: Jochen Friedrich <jochen@scram.de>
To: Kumar Gala <galak@kernel.crashing.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linuxppc-dev list <linuxppc-dev@ozlabs.org>,
"Kernel, Linux" <linux-kernel@vger.kernel.org>,
Scott Wood <scottwood@freescale.com>,
Paul Mackerras <paulus@samba.org>,
Jean Delvare <khali@linux-fr.org>,
David Miller <davem@davemloft.net>,
Linux I2C <i2c@lm-sensors.org>
Subject: [PATCH] [POWERPC] i2c: fix build breakage introduced by OF helpers
Date: Fri, 18 Apr 2008 16:23:03 +0200 [thread overview]
Message-ID: <4808AEC7.8040000@scram.de> (raw)
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 <jochen@scram.de>
---
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
next reply other threads:[~2008-04-18 14:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-18 14:23 Jochen Friedrich [this message]
2008-04-19 4:04 ` [PATCH] [POWERPC] i2c: fix build breakage introduced by OF helpers Paul Mackerras
2008-04-19 4:09 ` David Miller
2008-04-19 5:22 ` Paul Mackerras
2008-04-19 6:11 ` David Miller
2008-04-19 9:09 ` Jean Delvare
2008-04-19 9:12 ` David Miller
2008-04-19 11:45 ` Paul Mackerras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4808AEC7.8040000@scram.de \
--to=jochen@scram.de \
--cc=davem@davemloft.net \
--cc=galak@kernel.crashing.org \
--cc=i2c@lm-sensors.org \
--cc=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
--cc=scottwood@freescale.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).