diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-24 09:35:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-24 09:35:18 -0500 |
| commit | 30c27abd28fa168d7ebd2e5286f1fe473c74bfa9 (patch) | |
| tree | 9936b38c0c81cd430d5e75906c1207d127fe588c /include/linux/kobject.h | |
| parent | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (diff) | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
Merge tag 'v3.13-rc1' into asoc-arizona
Linux 3.13-rc1
Diffstat (limited to 'include/linux/kobject.h')
| -rw-r--r-- | include/linux/kobject.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index de6dcbcc6ef7..e7ba650086ce 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h | |||
| @@ -107,6 +107,7 @@ extern int __must_check kobject_move(struct kobject *, struct kobject *); | |||
| 107 | extern struct kobject *kobject_get(struct kobject *kobj); | 107 | extern struct kobject *kobject_get(struct kobject *kobj); |
| 108 | extern void kobject_put(struct kobject *kobj); | 108 | extern void kobject_put(struct kobject *kobj); |
| 109 | 109 | ||
| 110 | extern const void *kobject_namespace(struct kobject *kobj); | ||
| 110 | extern char *kobject_get_path(struct kobject *kobj, gfp_t flag); | 111 | extern char *kobject_get_path(struct kobject *kobj, gfp_t flag); |
| 111 | 112 | ||
| 112 | struct kobj_type { | 113 | struct kobj_type { |