diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:19:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:19:06 -0700 |
commit | 2513eb8e67a2483aecb5bf7fead7692d5aabbdcd (patch) | |
tree | 4969e9e0ae8a35553ef985af455e98beb86e2ed4 /drivers/base/bus.c | |
parent | d3745f46e32d86de188cf378f923b7a2ed5274f9 (diff) | |
parent | cd6ef2ada54aa4788d5a3dee3cffaad41383a52a (diff) |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 of HEAD
* HEAD:
[PATCH] The scheduled unexport of insert_resource
[PATCH] remove kernel/power/pm.c:pm_unregister_all()
[PATCH] Driver core: bus.c cleanups
[PATCH] Driver core: kernel-doc in drivers/base/core.c corrections
[PATCH] Driver core: fix driver-core kernel-doc
Diffstat (limited to 'drivers/base/bus.c')
-rw-r--r-- | drivers/base/bus.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 83fa8b291a5..2e954d07175 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -129,7 +129,7 @@ static struct kobj_type ktype_bus = { }; -decl_subsys(bus, &ktype_bus, NULL); +static decl_subsys(bus, &ktype_bus, NULL); #ifdef CONFIG_HOTPLUG @@ -598,12 +598,13 @@ void put_bus(struct bus_type * bus) * * Note that kset_find_obj increments bus' reference count. */ - +#if 0 struct bus_type * find_bus(char * name) { struct kobject * k = kset_find_obj(&bus_subsys.kset, name); return k ? to_bus(k) : NULL; } +#endif /* 0 */ /** |