lkml.org 
[lkml]   [2008]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
SubjectRe: linux-next: Tree for August 5 (MTD build error)
Date
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)";
}

\
 
 \ /
  Last update: 2008-08-06 13:15    [W:0.263 / U:0.172 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site