diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /arch/mn10300/lib/delay.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/mn10300/lib/delay.c')
| -rw-r--r-- | arch/mn10300/lib/delay.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mn10300/lib/delay.c b/arch/mn10300/lib/delay.c index cce66bc0822d..fdf6f710f94e 100644 --- a/arch/mn10300/lib/delay.c +++ b/arch/mn10300/lib/delay.c | |||
| @@ -28,7 +28,8 @@ void __delay(unsigned long loops) | |||
| 28 | "2: add -1,%0 \n" | 28 | "2: add -1,%0 \n" |
| 29 | " bne 2b \n" | 29 | " bne 2b \n" |
| 30 | : "=&d" (d0) | 30 | : "=&d" (d0) |
| 31 | : "0" (loops)); | 31 | : "0" (loops) |
| 32 | : "cc"); | ||
| 32 | } | 33 | } |
| 33 | EXPORT_SYMBOL(__delay); | 34 | EXPORT_SYMBOL(__delay); |
| 34 | 35 | ||