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/davem/sparc-2.6
[powerpc.git]
/
include
/
asm-powerpc
/
ohare.h
diff --git
a/include/asm-powerpc/ohare.h
b/include/asm-powerpc/ohare.h
index
023b597
..
0d030f9
100644
(file)
--- a/
include/asm-powerpc/ohare.h
+++ b/
include/asm-powerpc/ohare.h
@@
-1,3
+1,6
@@
+#ifndef _ASM_POWERPC_OHARE_H
+#define _ASM_POWERPC_OHARE_H
+#ifdef __KERNEL__
/*
* ohare.h: definitions for using the "O'Hare" I/O controller chip.
*
/*
* ohare.h: definitions for using the "O'Hare" I/O controller chip.
*
@@
-46,3
+49,6
@@
* Contributed by Harry Eaton.
*/
#define STARMAX_FEATURES 0xbeff7a
* Contributed by Harry Eaton.
*/
#define STARMAX_FEATURES 0xbeff7a
+
+#endif /* __KERNEL__ */
+#endif /* _ASM_POWERPC_OHARE_H */