From: Paul Bolle <pebolle@tiscali.nl>
To: Mike Frysinger <vapier@gentoo.org>
Cc: uclinux-dist-devel@blackfin.uclinux.org, linux-kernel@vger.kernel.org
Subject: [PATCH] Blackfin: bf537: rename "CONFIG_ADT7310" and friends
Date: Mon, 25 Mar 2013 12:43:51 +0100 [thread overview]
Message-ID: <1364211831.1390.285.camel@x61.thuisdomein> (raw)
The Kconfig symbol ADT7310 got removed in commit
2b0c856ad9571013db8fc369194b7108dff3c18e ("staging:iio: Consolidate
adt7310 and adt7410 driver"). That commit did not touch the references
to CONFIG_ADT7310 and CONFIG_ADT7310_MODULE in the BF537-STAMP code.
Convert these now, to their ADT7410 equivalents.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
0) Untested. This took a bit of guesswork. I guessed that multiple AD
drivers can be enabled at the same time in this code. And I also guessed
that the "adt7310" modalias is still correct.
1) If this passes testing it could go in stable (3.8.y).
arch/blackfin/mach-bf537/boards/stamp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 95114ed..23bb55d 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -700,7 +700,7 @@ static struct bfin5xx_spi_chip ad7816_spi_chip_info = {
};
#endif
-#if defined(CONFIG_ADT7310) || defined(CONFIG_ADT7310_MODULE)
+#if defined(CONFIG_ADT7410) || defined(CONFIG_ADT7410_MODULE)
static unsigned long adt7310_platform_data[3] = {
/* INT bound temperature alarm event. line 1 */
IRQ_PG4, IRQF_TRIGGER_LOW,
@@ -1062,7 +1062,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
},
#endif
-#if defined(CONFIG_ADT7310) || defined(CONFIG_ADT7310_MODULE)
+#if defined(CONFIG_ADT7410) || defined(CONFIG_ADT7410_MODULE)
{
.modalias = "adt7310",
.max_speed_hz = 1000000,
--
1.7.11.7
next reply other threads:[~2013-03-25 11:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-25 11:43 Paul Bolle [this message]
2013-03-25 11:55 ` [uclinux-dist-devel] " Lars-Peter Clausen
2013-03-25 12:01 ` Paul Bolle
2013-03-25 15:22 ` Guenter Roeck
2013-03-25 15:45 ` Lars-Peter Clausen
2014-02-13 9:57 ` Paul Bolle
2014-02-13 10:31 ` Paul Bolle
2014-02-13 16:29 ` Guenter Roeck
2014-02-13 17:03 ` Paul Bolle
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=1364211831.1390.285.camel@x61.thuisdomein \
--to=pebolle@tiscali.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=uclinux-dist-devel@blackfin.uclinux.org \
--cc=vapier@gentoo.org \
/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
all inboxes | Powered by JetHome®