Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/include/asm-cris/delay.h b/include/asm-cris/delay.h
index efc41aad48459aedb07975fbcc623ce32f71909e..d3a39780371993eabf5503b63ffe4432256f35fb 100644 (file)
--- a/include/asm-cris/delay.h
+++ b/include/asm-cris/delay.h
@@ -13,7 +13,7 @@
 
 extern unsigned long loops_per_usec; /* arch/cris/mm/init.c */
 
-extern __inline__ void udelay(unsigned long usecs)
+static inline void udelay(unsigned long usecs)
 {
        __delay(usecs * loops_per_usec);
 }