diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-24 15:53:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-24 15:53:45 -0400 |
| commit | 7c0a57d5c47bcfc492b3139e77400f888a935c44 (patch) | |
| tree | 1495a9238c7ee207d384737d3b777c0e21b75771 /drivers | |
| parent | 353d5c30c666580347515da609dd74a2b8e9b828 (diff) | |
| parent | 94da210af4978b94cb70318bd1b282a73c50b175 (diff) | |
Merge branch 'fixes' of git://git.marvell.com/orion
* 'fixes' of git://git.marvell.com/orion:
[ARM] Orion NAND: Make asm volatile avoid GCC pushing ldrd out of the loop
[ARM] Kirkwood: enable eSATA on QNAP TS-219P
[ARM] Kirkwood: __init requires linux/init.h
Diffstat (limited to 'drivers')
| -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; |