summaryrefslogtreecommitdiffstats
path: root/include/asm-s390/delay.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-03-09 20:33:35 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-03-09 20:33:35 +0000
commit116674acc97ba75a720329996877077d988443a2 (patch)
tree6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /include/asm-s390/delay.h
parent71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff)
Merge with Linux 2.4.2.
Diffstat (limited to 'include/asm-s390/delay.h')
-rw-r--r--include/asm-s390/delay.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/asm-s390/delay.h b/include/asm-s390/delay.h
index 87ac55391..357fdb835 100644
--- a/include/asm-s390/delay.h
+++ b/include/asm-s390/delay.h
@@ -15,11 +15,8 @@
#define _S390_DELAY_H
extern void __udelay(unsigned long usecs);
-extern void __const_udelay(unsigned long usecs);
extern void __delay(unsigned long loops);
-#define udelay(n) (__builtin_constant_p(n) ? \
- __const_udelay((n) * 0x10c6ul) : \
- __udelay(n))
+#define udelay(n) __udelay(n)
#endif /* defined(_S390_DELAY_H) */