diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-16 00:53:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-16 00:53:25 -0400 |
| commit | a9653cf540d407fb75deb3db65a1be6c81d53ee0 (patch) | |
| tree | 075fb79746f1d74443c9a9062e73c26a6266b05c /drivers/base/core.c | |
| parent | e80ac32767d0f781ac195c472d500a7451d3729a (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linux-2.6' into merge
Diffstat (limited to 'drivers/base/core.c')
| -rw-r--r-- | drivers/base/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 422cfcad48..ee0a51a3a4 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
| @@ -762,6 +762,7 @@ static void device_remove_class_symlinks(struct device *dev) | |||
| 762 | /** | 762 | /** |
| 763 | * dev_set_name - set a device name | 763 | * dev_set_name - set a device name |
| 764 | * @dev: device | 764 | * @dev: device |
| 765 | * @fmt: format string for the device's name | ||
| 765 | */ | 766 | */ |
| 766 | int dev_set_name(struct device *dev, const char *fmt, ...) | 767 | int dev_set_name(struct device *dev, const char *fmt, ...) |
| 767 | { | 768 | { |