Merge branch 'upstream-merged'

1 files changed, 10 insertions, 0 deletions

diff --git a/libdde_linux26/contrib/include/linux/kobj_map.h b/libdde_linux26/contrib/include/linux/kobj_map.h
new file mode 100644
index 00000000..73717ed9
--- /dev/null
+++ b/libdde_linux26/contrib/include/linux/kobj_map.h
@@ -0,0 +1,10 @@
+#include <linux/mutex.h>
+
+typedef struct kobject *kobj_probe_t(dev_t, int *, void *);
+struct kobj_map;
+
+int kobj_map(struct kobj_map *, dev_t, unsigned long, struct module *,
+	     kobj_probe_t *, int (*)(dev_t, void *), void *);
+void kobj_unmap(struct kobj_map *, dev_t, unsigned long);
+struct kobject *kobj_lookup(struct kobj_map *, dev_t, int *);
+struct kobj_map *kobj_map_init(kobj_probe_t *, struct mutex *);