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@xxxxxxxxxx>
Thanks, David.
---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
