From: Pavel Machek <pavel@ucw.cz>
To: rpurdie@rpsys.net, Russell King <rmk@arm.linux.org.uk>,
lenz@cs.wisc.edu, kernel list <linux-kernel@vger.kernel.org>
Subject: [patch] fix compilation in collie.c
Date: Thu, 21 Jul 2005 07:25:27 +0200 [thread overview]
Message-ID: <20050721052527.GC7849@elf.ucw.cz> (raw)
This fixes wrong number of arguments in call to write_scoop_reg, fixes
map_name and John's email. Please apply,
Signed-off-by: Pavel Machek <pavel@suse.cz>
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -11,7 +11,7 @@
* published by the Free Software Foundation.
*
* ChangeLog:
- * 03-06-2004 John Lenz <jelenz@wisc.edu>
+ * 03-06-2004 John Lenz <lenz@cs.wisc.edu>
* 06-04-2002 Chris Larson <kergoth@digitalnemesis.net>
* 04-16-2001 Lineo Japan,Inc. ...
*/
@@ -111,16 +180,16 @@ static struct mtd_partition collie_parti
static void collie_set_vpp(int vpp)
{
- write_scoop_reg(SCOOP_GPCR, read_scoop_reg(SCOOP_GPCR) | COLLIE_SCP_VPEN);
+ write_scoop_reg(NULL, SCOOP_GPCR, read_scoop_reg(NULL, SCOOP_GPCR) | COLLIE_SCP_VPEN);
if (vpp) {
- write_scoop_reg(SCOOP_GPWR, read_scoop_reg(SCOOP_GPWR) | COLLIE_SCP_VPEN);
+ write_scoop_reg(NULL, SCOOP_GPWR, read_scoop_reg(NULL, SCOOP_GPWR) | COLLIE_SCP_VPEN);
} else {
- write_scoop_reg(SCOOP_GPWR, read_scoop_reg(SCOOP_GPWR) & ~COLLIE_SCP_VPEN);
+ write_scoop_reg(NULL, SCOOP_GPWR, read_scoop_reg(NULL, SCOOP_GPWR) & ~COLLIE_SCP_VPEN);
}
}
static struct flash_platform_data collie_flash_data = {
- .map_name = "cfi_probe",
+ .map_name = "sharp",
.set_vpp = collie_set_vpp,
.parts = collie_partitions,
.nr_parts = ARRAY_SIZE(collie_partitions),
--
teflon -- maybe it is a trademark, but it should not be.
next reply other threads:[~2005-07-21 5:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-07-21 5:25 Pavel Machek [this message]
2005-07-24 22:35 ` [patch] fix compilation in collie.c Russell King
2005-07-24 23:02 ` Richard Purdie
2005-07-25 2:58 ` Pavel Machek
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=20050721052527.GC7849@elf.ucw.cz \
--to=pavel@ucw.cz \
--cc=lenz@cs.wisc.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=rpurdie@rpsys.net \
/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