diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 18:04:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 18:04:48 -0700 |
| commit | 5b339915762d30b21995aa7263e74081f2f1110a (patch) | |
| tree | 4e076dbd27025054b21dddd78a1cb3fef3de34d7 /drivers/base/firmware.c | |
| parent | 89661adaaee2f85116b399e642129ccd4dafd195 (diff) | |
| parent | 823bccfc4002296ba88c3ad0f049e1abd8108d30 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
remove "struct subsystem" as it is no longer needed
sysfs: printk format warning
DOC: Fix wrong identifier name in Documentation/driver-model/devres.txt
platform: reorder platform_device_del
Driver core: fix show_uevent from taking up way too much stack
Diffstat (limited to 'drivers/base/firmware.c')
| -rw-r--r-- | drivers/base/firmware.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/firmware.c b/drivers/base/firmware.c index cb1b98ae0d5..90c86293216 100644 --- a/drivers/base/firmware.c +++ b/drivers/base/firmware.c @@ -17,13 +17,13 @@ static decl_subsys(firmware, NULL, NULL); -int firmware_register(struct subsystem * s) +int firmware_register(struct kset *s) { - kset_set_kset_s(s, firmware_subsys); + kobj_set_kset_s(s, firmware_subsys); return subsystem_register(s); } -void firmware_unregister(struct subsystem * s) +void firmware_unregister(struct kset *s) { subsystem_unregister(s); } |