diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 17:17:14 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 17:17:14 +0400 |
commit | 620f2efcdc5c7a2db68da41bc3df3cf9a718024e (patch) | |
tree | b1a0411e2588953777d0b10245b12044c33cef54 /arch/s390/include/asm/delay.h | |
parent | 04944b793e18ece23f63c0252646b310c1845940 (diff) | |
parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
download | linux-620f2efcdc5c7a2db68da41bc3df3cf9a718024e.tar.xz |
Merge branch 'linus' into x86/xsave
Diffstat (limited to 'arch/s390/include/asm/delay.h')
-rw-r--r-- | arch/s390/include/asm/delay.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/include/asm/delay.h b/arch/s390/include/asm/delay.h index 78357314c450..a356c958e260 100644 --- a/arch/s390/include/asm/delay.h +++ b/arch/s390/include/asm/delay.h @@ -15,6 +15,7 @@ #define _S390_DELAY_H extern void __udelay(unsigned long usecs); +extern void udelay_simple(unsigned long usecs); extern void __delay(unsigned long loops); #define udelay(n) __udelay(n) |