diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-09 01:11:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-09 01:11:30 -0800 |
| commit | 0a983298a21165bd7321bd02de6f166293e2d884 (patch) | |
| tree | c4fbf4fa71aa38f63c38a17001e024a0bc8f6fd1 /include/linux/kobj_map.h | |
| parent | aa61674d1a2a026449e00de79d36fb921c13fe16 (diff) | |
| parent | 0c156ba8ede6d99bd1738d7d987d9d58f65d0aa9 (diff) | |
Merge bk://kernel.bkbits.net/gregkh/linux/2.6.11/driver
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux/kobj_map.h')
| -rw-r--r-- | include/linux/kobj_map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kobj_map.h b/include/linux/kobj_map.h index 404a945c1533..b6cc10bf8dfc 100644 --- a/include/linux/kobj_map.h +++ b/include/linux/kobj_map.h @@ -7,6 +7,6 @@ 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 subsystem *); +struct kobj_map *kobj_map_init(kobj_probe_t *, struct semaphore *); #endif |