diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 13:33:47 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 13:33:47 -0800 | 
| commit | 87d5df6bde5764f1f6c18fe32f80e83f5010fa8c (patch) | |
| tree | d3c861aba3777e032d70508a1133acc76031098c /lib/kobject.c | |
| parent | 4942093e9d3b1ebdb27f43b8f3e483981e85107e (diff) | |
| parent | ba3882a9178585289614c16a3b3f9b5f321d27b2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  HOWTO: update misspelling and word incorrected
  add stable_api_nonsense.txt in korean
  HOWTO: change addresses of maintainer and lxr url for Korean HOWTO
  Add Documentation for FAIR_USER_SCHED sysfs files
  HOWTO: Change man-page maintainer address for Japanese HOWTO
  tipar: remove obsolete module
  kobject: fix the documentation of how kobject_set_name works
Diffstat (limited to 'lib/kobject.c')
| -rw-r--r-- | lib/kobject.c | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index b52e9f4ef37..3590f022a60 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -234,13 +234,13 @@ int kobject_register(struct kobject * kobj)  /** - *	kobject_set_name - Set the name of an object - *	@kobj:	object. - *	@fmt:	format string used to build the name + * kobject_set_name - Set the name of a kobject + * @kobj: kobject to name + * @fmt: format string used to build the name   * - *	If strlen(name) >= KOBJ_NAME_LEN, then use a dynamically allocated - *	string that @kobj->k_name points to. Otherwise, use the static  - *	@kobj->name array. + * This sets the name of the kobject.  If you have already added the + * kobject to the system, you must call kobject_rename() in order to + * change the name of the kobject.   */  int kobject_set_name(struct kobject * kobj, const char * fmt, ...)  {  | 
