X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fkobject.h;h=d542faa6cb478494327d42c033cf4f5b7d9cabaa;hb=aab0de245150c09e61c30962feb16aacde508dc3;hp=caa3f411f15d0c48958e40d5369b4e16b9456b15;hpb=2ba14a017a4ba8d2266316f481d4ad7400073d18;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index caa3f411f15..d542faa6cb4 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -16,8 +16,6 @@
 #ifndef _KOBJECT_H_
 #define _KOBJECT_H_
 
-#ifdef __KERNEL__
-
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/sysfs.h>
@@ -28,7 +26,6 @@
 #include <linux/wait.h>
 #include <asm/atomic.h>
 
-#define KOBJ_NAME_LEN			20
 #define UEVENT_HELPER_PATH_LEN		256
 #define UEVENT_NUM_ENVP			32	/* number of env pointers */
 #define UEVENT_BUFFER_SIZE		2048	/* buffer for the variables */
@@ -224,5 +221,4 @@ static inline int kobject_action_type(const char *buf, size_t count,
 { return -EINVAL; }
 #endif
 
-#endif /* __KERNEL__ */
 #endif /* _KOBJECT_H_ */