From 155806d80dfb27089230b39b3742bdd03b5fc323 Mon Sep 17 00:00:00 2001
From: Simon Kagstrom <simon.kagstrom@netinsight.net>
Date: Thu, 20 Aug 2009 09:19:53 +0200
Subject: [PATCH] --- yaml --- r: 157049 b: refs/heads/master c:
 94da210af4978b94cb70318bd1b282a73c50b175 h: refs/heads/master i:   157047:
 1df9264a033540454dd739fe3bf4a63a21bdb3dd v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/mtd/nand/orion_nand.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5b4bd29a04db..423267634d2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c55bf102b675c94edef006ce487d909669221d90
+refs/heads/master: 94da210af4978b94cb70318bd1b282a73c50b175
diff --git a/trunk/drivers/mtd/nand/orion_nand.c b/trunk/drivers/mtd/nand/orion_nand.c
index 7ad972229db4..0d9d4bc9c762 100644
--- a/trunk/drivers/mtd/nand/orion_nand.c
+++ b/trunk/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)
 	buf64 = (uint64_t *)buf;
 	while (i < len/8) {
 		uint64_t x;
-		asm ("ldrd\t%0, [%1]" : "=r" (x) : "r" (io_base));
+		asm volatile ("ldrd\t%0, [%1]" : "=&r" (x) : "r" (io_base));
 		buf64[i++] = x;
 	}
 	i *= 8;