projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[powerpc.git]
/
include
/
asm-powerpc
/
macio.h
diff --git
a/include/asm-powerpc/macio.h
b/include/asm-powerpc/macio.h
index
b553dd4
..
3a6cb1a
100644
(file)
--- a/
include/asm-powerpc/macio.h
+++ b/
include/asm-powerpc/macio.h
@@
-1,5
+1,6
@@
#ifndef __MACIO_ASIC_H__
#define __MACIO_ASIC_H__
#ifndef __MACIO_ASIC_H__
#define __MACIO_ASIC_H__
+#ifdef __KERNEL__
#include <asm/of_device.h>
#include <asm/of_device.h>
@@
-137,4
+138,5
@@
struct macio_driver
extern int macio_register_driver(struct macio_driver *);
extern void macio_unregister_driver(struct macio_driver *);
extern int macio_register_driver(struct macio_driver *);
extern void macio_unregister_driver(struct macio_driver *);
+#endif /* __KERNEL__ */
#endif /* __MACIO_ASIC_H__ */
#endif /* __MACIO_ASIC_H__ */