diff options
| author | Tom Rini <trini@ti.com> | 2012-09-21 14:53:13 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-21 14:53:13 -0700 |
| commit | 495dbd72dd1172de866ba323263a5b62cf454972 (patch) | |
| tree | 3ecfb8ae44c871055115941890fd93f175f8761d /include/linux | |
| parent | 50d924b45911b24eeb7623bed11b9297d99b840a (diff) | |
| parent | d193c1b6eb05041c94ad9aacd8c94189d1dbc5f8 (diff) | |
| download | u-boot-imx-495dbd72dd1172de866ba323263a5b62cf454972.zip u-boot-imx-495dbd72dd1172de866ba323263a5b62cf454972.tar.gz u-boot-imx-495dbd72dd1172de866ba323263a5b62cf454972.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mtd/nand.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index c06866b..f63e04b 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -390,9 +390,10 @@ struct nand_ecc_ctrl { * consecutive order. */ struct nand_buffers { - uint8_t ecccalc[NAND_MAX_OOBSIZE]; - uint8_t ecccode[NAND_MAX_OOBSIZE]; - uint8_t databuf[NAND_MAX_PAGESIZE + NAND_MAX_OOBSIZE]; + uint8_t ecccalc[ALIGN(NAND_MAX_OOBSIZE, ARCH_DMA_MINALIGN)]; + uint8_t ecccode[ALIGN(NAND_MAX_OOBSIZE, ARCH_DMA_MINALIGN)]; + uint8_t databuf[ALIGN(NAND_MAX_PAGESIZE + NAND_MAX_OOBSIZE, + ARCH_DMA_MINALIGN)]; }; /** |