summaryrefslogtreecommitdiffstats
path: root/include/asm-xtensa/delay.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-07-14 01:11:44 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-07-14 01:11:44 +0200
commit08cd84c81f27d5bd22ba958b7cae6d566c509280 (patch)
tree6fdb546c151410851fd3c604d42590afa4215084 /include/asm-xtensa/delay.h
parentMerge /spare/repo/netdev-2.6 branch 'ieee80211' (diff)
parentMerge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6. (diff)
downloadlinux-08cd84c81f27d5bd22ba958b7cae6d566c509280.tar.xz
linux-08cd84c81f27d5bd22ba958b7cae6d566c509280.zip
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'include/asm-xtensa/delay.h')
-rw-r--r--include/asm-xtensa/delay.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-xtensa/delay.h b/include/asm-xtensa/delay.h
index 6359c55e77a8..0a123d53a636 100644
--- a/include/asm-xtensa/delay.h
+++ b/include/asm-xtensa/delay.h
@@ -21,7 +21,7 @@ extern unsigned long loops_per_jiffy;
extern __inline__ void __delay(unsigned long loops)
{
/* 2 cycles per loop. */
- __asm__ __volatile__ ("1: addi %0, %0, -2; bgeui %0, 1, 1b"
+ __asm__ __volatile__ ("1: addi %0, %0, -2; bgeui %0, 2, 1b"
: "=r" (loops) : "0" (loops));
}