diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-29 20:16:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-29 20:16:50 -0400 |
| commit | e9a4b6a3f6592862a67837e80aad3f50468857a6 (patch) | |
| tree | 087420cf91ac922c7e99757c4490a605ec7b10f2 /drivers/base | |
| parent | 441dbb500b4344a8e3125e5aabab4f9dbf72514f (diff) | |
| parent | 1702b52092e9a6d05398d3f9581ddc050ef00d06 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/base')
| -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 422cfcad486..ee0a51a3a41 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 | { |