Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b43890af886b14d3052d8b7f9e0b2f8d261dcd7d
Commit:     b43890af886b14d3052d8b7f9e0b2f8d261dcd7d
Parent:     151f6398301c30670456efd0c4801aa721d557b9
Author:     Jesper Nilsson <[EMAIL PROTECTED]>
AuthorDate: Mon Jan 21 16:38:41 2008 +0100
Committer:  Jesper Nilsson <[EMAIL PROTECTED]>
CommitDate: Fri Feb 8 11:06:32 2008 +0100

    CRIS: Allow arch dependent delay to override common version.
---
 include/asm-cris/delay.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/include/asm-cris/delay.h b/include/asm-cris/delay.h
index d3a3978..123e19a 100644
--- a/include/asm-cris/delay.h
+++ b/include/asm-cris/delay.h
@@ -13,10 +13,13 @@
 
 extern unsigned long loops_per_usec; /* arch/cris/mm/init.c */
 
+/* May be defined by arch/delay.h. */
+#ifndef udelay
 static inline void udelay(unsigned long usecs)
 {
        __delay(usecs * loops_per_usec);
 }
+#endif
 
 #endif /* defined(_CRIS_DELAY_H) */
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to