diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 07:22:08 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 07:22:08 -0400 |
| commit | fb8231a8b139035476f2a8aaac837d0099b66dad (patch) | |
| tree | 2875806beb96ea0cdab292146767a5085721dc6a /drivers/base/core.c | |
| parent | 426d31071ac476ea62c62656b242930c17b58c00 (diff) | |
| parent | f6cec0ae58c17522a7bc4e2f39dae19f199ab534 (diff) | |
Merge branch 'master' into for-next
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
Diffstat (limited to 'drivers/base/core.c')
| -rw-r--r-- | drivers/base/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 74707b88f116..aed85f1c446e 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
| @@ -1599,7 +1599,7 @@ EXPORT_SYMBOL_GPL(device_destroy); | |||
| 1599 | * on the same device to ensure that new_name is valid and | 1599 | * on the same device to ensure that new_name is valid and |
| 1600 | * won't conflict with other devices. | 1600 | * won't conflict with other devices. |
| 1601 | */ | 1601 | */ |
| 1602 | int device_rename(struct device *dev, char *new_name) | 1602 | int device_rename(struct device *dev, const char *new_name) |
| 1603 | { | 1603 | { |
| 1604 | char *old_class_name = NULL; | 1604 | char *old_class_name = NULL; |
| 1605 | char *new_class_name = NULL; | 1605 | char *new_class_name = NULL; |