diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-06-14 09:13:41 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-06-14 09:13:41 +0200 |
| commit | db17be7f3495869c62cdcdfb387836f7b5a8df9e (patch) | |
| tree | c1fc100c6694ab52bdedf95d14a2787c98dbb1ab /include | |
| parent | 6bfb591cc11ddc297ac8dcb0fc4ecab310ee6b1e (diff) | |
| parent | 51061a9884a3a3a73a8ae583867714065fa64242 (diff) | |
| download | barebox-db17be7f3495869c62cdcdfb387836f7b5a8df9e.tar.gz barebox-db17be7f3495869c62cdcdfb387836f7b5a8df9e.tar.xz | |
Merge branch 'for-next/mtd'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mtd/nand.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 5beec39b75..76a6425be8 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -169,7 +169,7 @@ typedef enum { /* Device supports subpage reads */ /* Disabled in barebox for smaller binary sizes */ -#define NAND_SUBPAGE_READ (__BAREBOX__ ? 0x0 : 0x00001000) +#define NAND_SUBPAGE_READ (0x00001000) /* Options valid for Samsung large page devices */ #define NAND_SAMSUNG_LP_OPTIONS NAND_CACHEPRG @@ -352,7 +352,7 @@ struct nand_ecc_ctrl { int (*read_page)(struct mtd_info *mtd, struct nand_chip *chip, uint8_t *buf, int oob_required, int page); int (*read_subpage)(struct mtd_info *mtd, struct nand_chip *chip, - uint32_t offs, uint32_t len, uint8_t *buf); + uint32_t offs, uint32_t len, uint8_t *buf, int page); int (*write_subpage)(struct mtd_info *mtd, struct nand_chip *chip, uint32_t offset, uint32_t data_len, const uint8_t *data_buf, int oob_required); |