diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
| commit | 292dd876ee765c478b27c93cc51e93a558ed58bf (patch) | |
| tree | 5b740e93253295baee2a9c414a6c66d03d44a9ef /include/asm-powerpc/macio.h | |
| parent | d4ec6c7cc9a15a7a529719bc3b84f46812f9842e (diff) | |
| parent | 9fdb62af92c741addbea15545f214a6e89460865 (diff) | |
Pull release into acpica branch
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__ */ |