Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / include / linux / configfs.h

diff --git a/include/linux/configfs.h b/include/linux/configfs.h
index 8c6967f3fb1101002a3fddb9141979cca208255e..3ae65b1bf90fd891b32538390c103f12632560fd 100644 (file)
--- a/include/linux/configfs.h
+++ b/include/linux/configfs.h
@@ -35,8 +35,7 @@
 #ifndef _CONFIGFS_H_
 #define _CONFIGFS_H_
 
-#ifdef __KERNEL__
-
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/kref.h>
@@ -193,6 +192,4 @@ void configfs_unregister_subsystem(struct configfs_subsystem *subsys);
 int configfs_depend_item(struct configfs_subsystem *subsys, struct config_item *target);
 void configfs_undepend_item(struct configfs_subsystem *subsys, struct config_item *target);
 
-#endif  /* __KERNEL__ */
-
 #endif /* _CONFIGFS_H_ */