From d0ea5c339f5befb3fa369e13ae7a68ebd07353a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Mon, 21 Jun 2010 16:11:45 +0200 Subject: [PATCH] --- yaml --- r: 205523 b: refs/heads/master c: 737a3bb9416ce2a7c7a4170852473a4fcc9c67e8 h: refs/heads/master i: 205521: 283ad3d2e8469f5b6e8ca71744f1ae8ab69099e6 205519: 7e01b9f533bbf7a3a8cce264661d041a0333ff0c v: v3 --- [refs] | 2 +- trunk/drivers/base/platform.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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,