diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 07:09:18 (GMT) |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 07:09:18 (GMT) |
commit | 68fe0f0a6dcd2ac1ace5da3647a6d1cf0f4d2fea (patch) | |
tree | 69d855c2e46d42ef8f23680cf3a1e6ff38de9ef4 /Documentation/kobject.txt | |
parent | 88fd449e734a4264347e12b8ff74ccb33a9b9a35 (diff) | |
parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
download | linux-68fe0f0a6dcd2ac1ace5da3647a6d1cf0f4d2fea.tar.xz |
Merge tag 'v3.7-rc3' into for-linus to sync up with recent USB changes
Diffstat (limited to 'Documentation/kobject.txt')
-rw-r--r-- | Documentation/kobject.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt index 49578cf..c5182bb 100644 --- a/Documentation/kobject.txt +++ b/Documentation/kobject.txt @@ -284,9 +284,11 @@ instead, it is associated with the ktype. So let us introduce struct kobj_type: struct kobj_type { - void (*release)(struct kobject *); + void (*release)(struct kobject *kobj); const struct sysfs_ops *sysfs_ops; - struct attribute **default_attrs; + struct attribute **default_attrs; + const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj); + const void *(*namespace)(struct kobject *kobj); }; This structure is used to describe a particular type of kobject (or, more |