projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'efi-2020-07-rc6' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
[oweals/u-boot.git]
/
drivers
/
mtd
/
nand
/
spi
/
micron.c
diff --git
a/drivers/mtd/nand/spi/micron.c
b/drivers/mtd/nand/spi/micron.c
index 83951c5d0f7290ff195d55977ea559ee7aae7c56..04de51cb46673054e4e9fd656c1485ecb6f26025 100644
(file)
--- a/
drivers/mtd/nand/spi/micron.c
+++ b/
drivers/mtd/nand/spi/micron.c
@@
-7,9
+7,11
@@
*/
#ifndef __UBOOT__
*/
#ifndef __UBOOT__
+#include <malloc.h>
#include <linux/device.h>
#include <linux/kernel.h>
#endif
#include <linux/device.h>
#include <linux/kernel.h>
#endif
+#include <linux/bitops.h>
#include <linux/mtd/spinand.h>
#define SPINAND_MFR_MICRON 0x2c
#include <linux/mtd/spinand.h>
#define SPINAND_MFR_MICRON 0x2c
@@
-63,7
+65,7
@@
static int mt29f2g01abagd_ooblayout_free(struct mtd_info *mtd, int section,
static const struct mtd_ooblayout_ops mt29f2g01abagd_ooblayout = {
.ecc = mt29f2g01abagd_ooblayout_ecc,
static const struct mtd_ooblayout_ops mt29f2g01abagd_ooblayout = {
.ecc = mt29f2g01abagd_ooblayout_ecc,
- .free = mt29f2g01abagd_ooblayout_free,
+ .
r
free = mt29f2g01abagd_ooblayout_free,
};
static int mt29f2g01abagd_ecc_get_status(struct spinand_device *spinand,
};
static int mt29f2g01abagd_ecc_get_status(struct spinand_device *spinand,