Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'linus' into...

[linux-2.6-omap-h63xx.git] / include / linux / nubus.h

diff --git a/include/linux/nubus.h b/include/linux/nubus.h
index 9be57d99269576e756d457bcfb2464cbdf80ca6a..e137b3c486a7799f9f39b470f827db2ab00dc819 100644 (file)
--- a/include/linux/nubus.h
+++ b/include/linux/nubus.h
@@ -237,6 +237,7 @@ struct nubus_dirent
        int mask;
 };
 
+#ifdef __KERNEL__
 struct nubus_board {
        struct nubus_board* next;
        struct nubus_dev* first_dev;
@@ -296,7 +297,6 @@ 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 */