diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 02:38:26 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 02:38:26 -0400 |
| commit | b1e50ebcf24668e57f058deb48b0704b5391ed0f (patch) | |
| tree | 17e1b69b249d0738317b732186340c9dd053f1a1 /include/linux/kobj_map.h | |
| parent | 0c2a2ae32793e3500a15a449612485f5d17dd431 (diff) | |
| parent | 7e125f7b9cbfce4101191b8076d606c517a73066 (diff) | |
Merge remote branch 'origin' into secretlab/next-spi
Diffstat (limited to 'include/linux/kobj_map.h')
| -rw-r--r-- | include/linux/kobj_map.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/kobj_map.h b/include/linux/kobj_map.h index 73717ed9ea79..18ca75ffcc5a 100644 --- a/include/linux/kobj_map.h +++ b/include/linux/kobj_map.h | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | /* | ||
| 2 | * kobj_map.h | ||
| 3 | */ | ||
| 4 | |||
| 5 | #ifndef _KOBJ_MAP_H_ | ||
| 6 | #define _KOBJ_MAP_H_ | ||
| 7 | |||
| 1 | #include <linux/mutex.h> | 8 | #include <linux/mutex.h> |
| 2 | 9 | ||
| 3 | typedef struct kobject *kobj_probe_t(dev_t, int *, void *); | 10 | typedef struct kobject *kobj_probe_t(dev_t, int *, void *); |
| @@ -8,3 +15,5 @@ int kobj_map(struct kobj_map *, dev_t, unsigned long, struct module *, | |||
| 8 | void kobj_unmap(struct kobj_map *, dev_t, unsigned long); | 15 | void kobj_unmap(struct kobj_map *, dev_t, unsigned long); |
| 9 | struct kobject *kobj_lookup(struct kobj_map *, dev_t, int *); | 16 | struct kobject *kobj_lookup(struct kobj_map *, dev_t, int *); |
| 10 | struct kobj_map *kobj_map_init(kobj_probe_t *, struct mutex *); | 17 | struct kobj_map *kobj_map_init(kobj_probe_t *, struct mutex *); |
| 18 | |||
| 19 | #endif /* _KOBJ_MAP_H_ */ | ||