diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
| commit | 9e4c84967ef027fe50a03cf48dd6da9519c8e60c (patch) | |
| tree | 21d6b8168670f22521f3bb703e3b9d1932566c1c /arch/mn10300/lib/delay.c | |
| parent | d2f2fcd2541bae004db7f4798ffd9d2cb75ae817 (diff) | |
| parent | 3fb4a508b8e7957aa899f32cd6d9d462e102c7ca (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
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 | ||