diff --git a/[refs] b/[refs] index 5c67274d0562..289d417204b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11e3123d9fdbe0aab1adf9ab5a5b1b28aa91daa7 +refs/heads/master: 5a3072be6ce00b10565c78da05ad78df41310045 diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c index 7a24895543e7..a7c06374062e 100644 --- a/trunk/drivers/base/platform.c +++ b/trunk/drivers/base/platform.c @@ -383,7 +383,7 @@ EXPORT_SYMBOL_GPL(platform_device_unregister); * Returns &struct platform_device pointer on success, or ERR_PTR() on error. */ struct platform_device *platform_device_register_full( - struct platform_device_info *pdevinfo) + const struct platform_device_info *pdevinfo) { int ret = -ENOMEM; struct platform_device *pdev; diff --git a/trunk/include/linux/platform_device.h b/trunk/include/linux/platform_device.h index 165a8d175370..5622fa24e97b 100644 --- a/trunk/include/linux/platform_device.h +++ b/trunk/include/linux/platform_device.h @@ -63,7 +63,7 @@ struct platform_device_info { u64 dma_mask; }; extern struct platform_device *platform_device_register_full( - struct platform_device_info *pdevinfo); + const struct platform_device_info *pdevinfo); /** * platform_device_register_resndata - add a platform-level device with