diff --git a/[refs] b/[refs]
index 4294d6fbe099..f89c6835fda2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c63e07834bb12910bea41da15b8902150f5217c2
+refs/heads/master: 6eefd34fdcbd34e2cddb8b7da26d838367591954
diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c
index 0338289f9b5c..f9c903ba9fcd 100644
--- a/trunk/drivers/base/platform.c
+++ b/trunk/drivers/base/platform.c
@@ -212,7 +212,7 @@ EXPORT_SYMBOL_GPL(platform_device_add_resources);
  *	pointer.  The memory associated with the platform data will be freed
  *	when the platform device is released.
  */
-int platform_device_add_data(struct platform_device *pdev, void *data, size_t size)
+int platform_device_add_data(struct platform_device *pdev, const void *data, size_t size)
 {
 	void *d;
 
diff --git a/trunk/include/linux/platform_device.h b/trunk/include/linux/platform_device.h
index 20f47b81d3fa..8bbd459eafdc 100644
--- a/trunk/include/linux/platform_device.h
+++ b/trunk/include/linux/platform_device.h
@@ -39,7 +39,7 @@ extern struct platform_device *platform_device_register_simple(char *, unsigned
 
 extern struct platform_device *platform_device_alloc(const char *name, unsigned int id);
 extern int platform_device_add_resources(struct platform_device *pdev, struct resource *res, unsigned int num);
-extern int platform_device_add_data(struct platform_device *pdev, void *data, size_t size);
+extern int platform_device_add_data(struct platform_device *pdev, const void *data, size_t size);
 extern int platform_device_add(struct platform_device *pdev);
 extern void platform_device_del(struct platform_device *pdev);
 extern void platform_device_put(struct platform_device *pdev);