diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/kobject.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/kobject.h')
| -rw-r--r-- | include/linux/kobject.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index caa3f411f15d..39e709f88aa0 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h | |||
| @@ -16,8 +16,6 @@ | |||
| 16 | #ifndef _KOBJECT_H_ | 16 | #ifndef _KOBJECT_H_ |
| 17 | #define _KOBJECT_H_ | 17 | #define _KOBJECT_H_ |
| 18 | 18 | ||
| 19 | #ifdef __KERNEL__ | ||
| 20 | |||
| 21 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 22 | #include <linux/list.h> | 20 | #include <linux/list.h> |
| 23 | #include <linux/sysfs.h> | 21 | #include <linux/sysfs.h> |
| @@ -224,5 +222,4 @@ static inline int kobject_action_type(const char *buf, size_t count, | |||
| 224 | { return -EINVAL; } | 222 | { return -EINVAL; } |
| 225 | #endif | 223 | #endif |
| 226 | 224 | ||
| 227 | #endif /* __KERNEL__ */ | ||
| 228 | #endif /* _KOBJECT_H_ */ | 225 | #endif /* _KOBJECT_H_ */ |