diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-03 13:55:06 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-03 13:55:06 +0100 |
| commit | 87fe85133fa7f33c2bc9882826666a7f117c62bd (patch) | |
| tree | ab251f47a34b8c8c5b7c21aa45c818de926aa8d1 /include/linux/nubus.h | |
| parent | 1ff8f739c7cc4eaa89b6ba986494f458ff7bdbef (diff) | |
| parent | 15c554439faedfa490389b31db893dc764245e88 (diff) | |
Merge branch 'core/header-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tipclean into core/header-fixes
Diffstat (limited to 'include/linux/nubus.h')
| -rw-r--r-- | include/linux/nubus.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/nubus.h b/include/linux/nubus.h index 7382af37473..9be57d99269 100644 --- a/include/linux/nubus.h +++ b/include/linux/nubus.h @@ -296,6 +296,7 @@ struct nubus_dev { struct nubus_board* board; }; +#ifdef __KERNEL__ /* This is all NuBus devices (used to find devices later on) */ extern struct nubus_dev* nubus_devices; /* This is all NuBus cards */ @@ -351,6 +352,7 @@ void nubus_get_rsrc_mem(void* dest, void nubus_get_rsrc_str(void* dest, const struct nubus_dirent *dirent, int maxlen); +#endif /* __KERNEL__ */ /* We'd like to get rid of this eventually. Only daynaport.c uses it now. */ static inline void *nubus_slot_addr(int slot) |