diff --git a/[refs] b/[refs] index f8c75db02fef..0ca4b28ffbe2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44f28bdea09415d40b4d73a7668db5961362ec53 +refs/heads/master: 737a3bb9416ce2a7c7a4170852473a4fcc9c67e8 diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c index ffcfd73fe8a6..1bb8faaa443f 100644 --- a/trunk/drivers/base/platform.c +++ b/trunk/drivers/base/platform.c @@ -357,7 +357,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_resndata( +struct platform_device *__init_or_module platform_device_register_resndata( struct device *parent, const char *name, int id, const struct resource *res, unsigned int num,