diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
| commit | 6150c32589d1976ca8a5c987df951088c05a7542 (patch) | |
| tree | 94073696576323ff966e365d8c47b8ecd8372f97 /include/asm-powerpc/delay.h | |
| parent | 44637a12f80b80157d9c1bc5b7d6ef09c9e05713 (diff) | |
| parent | be42d5fa3772241b8ecebd443f1fb36247959c54 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include/asm-powerpc/delay.h')
| -rw-r--r-- | include/asm-powerpc/delay.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/delay.h b/include/asm-powerpc/delay.h index 54fe1f4f8fd0..057a60955474 100644 --- a/include/asm-powerpc/delay.h +++ b/include/asm-powerpc/delay.h | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #ifndef _ASM_POWERPC_DELAY_H | 1 | #ifndef _ASM_POWERPC_DELAY_H |
| 2 | #define _ASM_POWERPC_DELAY_H | 2 | #define _ASM_POWERPC_DELAY_H |
| 3 | #ifdef __KERNEL__ | ||
| 3 | 4 | ||
| 4 | /* | 5 | /* |
| 5 | * Copyright 1996, Paul Mackerras. | 6 | * Copyright 1996, Paul Mackerras. |
| @@ -16,4 +17,5 @@ | |||
| 16 | extern void __delay(unsigned long loops); | 17 | extern void __delay(unsigned long loops); |
| 17 | extern void udelay(unsigned long usecs); | 18 | extern void udelay(unsigned long usecs); |
| 18 | 19 | ||
| 20 | #endif /* __KERNEL__ */ | ||
| 19 | #endif /* _ASM_POWERPC_DELAY_H */ | 21 | #endif /* _ASM_POWERPC_DELAY_H */ |