summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesper Nilsson2008-01-21 16:38:41 +0100
committerJesper Nilsson2008-02-08 11:06:32 +0100
commitb43890af886b14d3052d8b7f9e0b2f8d261dcd7d (patch)
tree9a20e79fe685a0e8428d7c0c4431f0944313d2ca
parentCRIS: Include arch dependent bug.h. (diff)
downloadkernel-qcow2-linux-b43890af886b14d3052d8b7f9e0b2f8d261dcd7d.tar.gz
kernel-qcow2-linux-b43890af886b14d3052d8b7f9e0b2f8d261dcd7d.tar.xz
kernel-qcow2-linux-b43890af886b14d3052d8b7f9e0b2f8d261dcd7d.zip
CRIS: Allow arch dependent delay to override common version.
-rw-r--r--include/asm-cris/delay.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-cris/delay.h b/include/asm-cris/delay.h
index d3a397803719..123e19aef49d 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) */