Merge branch 'master' into for-next

[mv-sheeva.git] / drivers / base / core.c

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 74707b88f11634c3a41a521bbdf68ad9260dec81..aed85f1c446eba6e92c958bfaafe87e4ae2579f9 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1599,7 +1599,7 @@ EXPORT_SYMBOL_GPL(device_destroy);
  * on the same device to ensure that new_name is valid and
  * won't conflict with other devices.
  */
-int device_rename(struct device *dev, char *new_name)
+int device_rename(struct device *dev, const char *new_name)
 {
        char *old_class_name = NULL;
        char *new_class_name = NULL;