Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually

[linux-2.6] / include / asm-xtensa / delay.h

diff --git a/include/asm-xtensa/delay.h b/include/asm-xtensa/delay.h
index 6359c55e77a8e2cf4621b661b49b32156cb8ef40..1bc601ec3621a0bca23226ab8758f4a94e04cc84 100644 (file)
--- a/include/asm-xtensa/delay.h
+++ b/include/asm-xtensa/delay.h
@@ -18,10 +18,10 @@
 
 extern unsigned long loops_per_jiffy;
 
-extern __inline__ void __delay(unsigned long loops)
+static 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));
 }