projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[powerpc.git]
/
include
/
asm-powerpc
/
delay.h
diff --git
a/include/asm-powerpc/delay.h
b/include/asm-powerpc/delay.h
index
54fe1f4
..
057a609
100644
(file)
--- a/
include/asm-powerpc/delay.h
+++ b/
include/asm-powerpc/delay.h
@@
-1,5
+1,6
@@
#ifndef _ASM_POWERPC_DELAY_H
#define _ASM_POWERPC_DELAY_H
#ifndef _ASM_POWERPC_DELAY_H
#define _ASM_POWERPC_DELAY_H
+#ifdef __KERNEL__
/*
* Copyright 1996, Paul Mackerras.
/*
* Copyright 1996, Paul Mackerras.
@@
-16,4
+17,5
@@
extern void __delay(unsigned long loops);
extern void udelay(unsigned long usecs);
extern void __delay(unsigned long loops);
extern void udelay(unsigned long usecs);
+#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_DELAY_H */
#endif /* _ASM_POWERPC_DELAY_H */