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/macio.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/macio.h')
| -rw-r--r-- | include/asm-powerpc/macio.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/macio.h b/include/asm-powerpc/macio.h index b553dd4b139e..3a6cb1a513b7 100644 --- a/include/asm-powerpc/macio.h +++ b/include/asm-powerpc/macio.h | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #ifndef __MACIO_ASIC_H__ | 1 | #ifndef __MACIO_ASIC_H__ |
| 2 | #define __MACIO_ASIC_H__ | 2 | #define __MACIO_ASIC_H__ |
| 3 | #ifdef __KERNEL__ | ||
| 3 | 4 | ||
| 4 | #include <asm/of_device.h> | 5 | #include <asm/of_device.h> |
| 5 | 6 | ||
| @@ -137,4 +138,5 @@ struct macio_driver | |||
| 137 | extern int macio_register_driver(struct macio_driver *); | 138 | extern int macio_register_driver(struct macio_driver *); |
| 138 | extern void macio_unregister_driver(struct macio_driver *); | 139 | extern void macio_unregister_driver(struct macio_driver *); |
| 139 | 140 | ||
| 141 | #endif /* __KERNEL__ */ | ||
| 140 | #endif /* __MACIO_ASIC_H__ */ | 142 | #endif /* __MACIO_ASIC_H__ */ |