summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBodo Stroesser <bstroesser@fujitsu-siemens.com>2005-05-05 16:15:37 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-05 16:36:38 -0700
commit5fd861b682785f650114f4df53060d1be7fedecd (patch)
treeeaa02425c2be79ac21ecc684a5b2a31d9f3320c2 /include
parent7d37c6d52fce13008f20344790a81a6a5a0003b3 (diff)
[PATCH] uml: s390 preparation, delay moved to arch
s390 has fast read access to realtime clock (nanosecond resolution). So it makes sense to have an arch-specific implementation not only of __delay, but __udelay also. Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com> Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-um/delay.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-um/delay.h b/include/asm-um/delay.h
index 40695576ca6..0985bda6675 100644
--- a/include/asm-um/delay.h
+++ b/include/asm-um/delay.h
@@ -4,4 +4,6 @@
#include "asm/arch/delay.h"
#include "asm/archparam.h"
+#define MILLION 1000000
+
#endif