diff options
| author | David Brownell <david-b@pacbell.net> | 2008-08-06 04:13:08 -0700 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-07 15:04:33 +1000 |
| commit | 7a815887f193aa4a6fb8da039b92529c199e99f5 (patch) | |
| tree | 9bd914e8dbca4935cd47f7ca824037ccdef70e7d | |
| parent | 283cff46b4ba33253f7f4f6b1333ea18c819eff6 (diff) | |
mtd_dataflash build fix
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.
| -rw-r--r-- | drivers/mtd/devices/mtd_dataflash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index 17c9b20dca87..90161277902b 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c @@ -618,7 +618,7 @@ static char *otp_setup(struct mtd_info *device, char revision) #else -static char *otp_setup(struct mtd_info *device) +static char *otp_setup(struct mtd_info *device, char revision) { return " (OTP)"; } |