diff --git a/[refs] b/[refs]
index 94a5a8eef9d5..8491aa4a44f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fd69dc578fa0b1bbc3aad70ae3af9a137211707
+refs/heads/master: 6937e8f8c0135f2325194c372ada6dc655499992
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index f8e72724dd4b..d1b2c9adc271 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/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;
diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h
index 0ca24e93304f..516fecacf27b 100644
--- a/trunk/include/linux/device.h
+++ b/trunk/include/linux/device.h
@@ -552,7 +552,7 @@ extern int device_for_each_child(struct device *dev, void *data,
 		     int (*fn)(struct device *dev, void *data));
 extern struct device *device_find_child(struct device *dev, void *data,
 				int (*match)(struct device *dev, void *data));
-extern int device_rename(struct device *dev, char *new_name);
+extern int device_rename(struct device *dev, const char *new_name);
 extern int device_move(struct device *dev, struct device *new_parent,
 		       enum dpm_order dpm_order);
 extern const char *device_get_devnode(struct device *dev,