X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fkobj_map.h;h=73717ed9ea7912788cbe2c7f550eefd843d4aa97;hb=9144f3821d2cba9f16cdf3ff1b881384f4b68b53;hp=cbe7d8008042baa9385d3e3ec01aaf48b485b614;hpb=7079060f3e86ea4c1d4e9c1e356592ef9dcaaa1f;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/kobj_map.h b/include/linux/kobj_map.h
index cbe7d800804..73717ed9ea7 100644
--- a/include/linux/kobj_map.h
+++ b/include/linux/kobj_map.h
@@ -1,6 +1,4 @@
-#ifdef __KERNEL__
-
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 
 typedef struct kobject *kobj_probe_t(dev_t, int *, void *);
 struct kobj_map;
@@ -9,6 +7,4 @@ 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 semaphore *);
-
-#endif
+struct kobj_map *kobj_map_init(kobj_probe_t *, struct mutex *);