diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-26 23:12:40 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-26 23:12:40 -0400 |
| commit | f480fe3916de2e2cbb6e384cb685f0f1d8272188 (patch) | |
| tree | 141c60a2a263f1c01907e692d4aef1e6b699d8c7 /drivers/mtd | |
| parent | 4f0dbc2781b9dc457159b676289f874ab2dc3560 (diff) | |
| parent | f415c413f458837bd0c27086b79aca889f9435e4 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/orion_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c index 7ad972229db4..0d9d4bc9c762 100644 --- a/drivers/mtd/nand/orion_nand.c +++ b/drivers/mtd/nand/orion_nand.c | |||
| @@ -61,7 +61,7 @@ static void orion_nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len) | |||
| 61 | buf64 = (uint64_t *)buf; | 61 | buf64 = (uint64_t *)buf; |
| 62 | while (i < len/8) { | 62 | while (i < len/8) { |
| 63 | uint64_t x; | 63 | uint64_t x; |
| 64 | asm ("ldrd\t%0, [%1]" : "=r" (x) : "r" (io_base)); | 64 | asm volatile ("ldrd\t%0, [%1]" : "=&r" (x) : "r" (io_base)); |
| 65 | buf64[i++] = x; | 65 | buf64[i++] = x; |
| 66 | } | 66 | } |
| 67 | i *= 8; | 67 | i *= 8; |