From: Randy Dunlap <randy.dunlap@oracle•com>
To: David Brownell <david-b@pacbell•net>
Cc: dwmw2@infradead•org, Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: Tree for August 5 (MTD build error)
Date: Wed, 6 Aug 2008 17:13:48 -0700 [thread overview]
Message-ID: <20080806171348.a129245b.randy.dunlap@oracle.com> (raw)
In-Reply-To: <200808060413.08723.david-b@pacbell.net>
On Wed, 6 Aug 2008 04:13:08 -0700 David Brownell wrote:
> On Wednesday 06 August 2008, David Brownell wrote:
> > On Tuesday 05 August 2008, Randy Dunlap wrote:
> > >
> > > linux-next-20080805/drivers/mtd/devices/mtd_dataflash.c: In function 'add_dataflash_otp':
> > > linux-next-20080805/drivers/mtd/devices/mtd_dataflash.c:670: error: too many arguments to function 'otp_setup'
> >
> > Bad merge somewhere?
>
> Whoops, sorry ... I see what was going on. My bad.
>
> --- g26.orig/drivers/mtd/devices/mtd_dataflash.c 2008-08-06 04:12:45.000000000 -0700
> +++ g26/drivers/mtd/devices/mtd_dataflash.c 2008-08-06 04:11:55.000000000 -0700
> @@ -616,7 +616,7 @@ static char *otp_setup(struct mtd_info *
>
> #else
>
> -static char *otp_setup(struct mtd_info *device)
> +static char *otp_setup(struct mtd_info *device, char revision)
> {
> return " (OTP)";
> }
> --
Acked-by: Randy Dunlap <randy.dunlap@oracle•com>
Thanks, David.
---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
next prev parent reply other threads:[~2008-08-07 0:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-05 7:59 linux-next: Tree for August 5 Stephen Rothwell
2008-08-05 15:49 ` Stefan Richter
2008-08-05 15:55 ` David Woodhouse
2008-08-06 0:55 ` linux-next: Tree for August 5 (MTD build error) Randy Dunlap
[not found] ` <200808060320.20064.david-b@pacbell.net>
2008-08-06 11:13 ` David Brownell
2008-08-07 0:13 ` Randy Dunlap [this message]
2008-08-07 4:40 ` Stephen Rothwell
2008-08-07 8:26 ` David Woodhouse
2008-08-07 11:04 ` Stephen Rothwell
2008-08-06 1:03 ` linux-next: Tree for August 5 (XEN) Randy Dunlap
2008-08-06 1:15 ` Jeremy Fitzhardinge
2008-08-06 2:30 ` Randy Dunlap
2008-08-06 6:31 ` Stephen Rothwell
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=20080806171348.a129245b.randy.dunlap@oracle.com \
--to=randy.dunlap@oracle$(echo .)com \
--cc=david-b@pacbell$(echo .)net \
--cc=dwmw2@infradead$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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