Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[safe/jmp/linux-2.6] / include / linux / nubus.h

diff --git a/include/linux/nubus.h b/include/linux/nubus.h
index c435507..e137b3c 100644 (file)
--- a/include/linux/nubus.h
+++ b/include/linux/nubus.h
@@ -12,6 +12,7 @@
 #ifndef LINUX_NUBUS_H
 #define LINUX_NUBUS_H
 
+#include <linux/types.h>
 #ifdef __KERNEL__
 #include <asm/nubus.h>
 #endif
@@ -236,6 +237,7 @@ struct nubus_dirent
        int mask;
 };
 
+#ifdef __KERNEL__
 struct nubus_board {
        struct nubus_board* next;
        struct nubus_dev* first_dev;
@@ -350,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)