From 13e4058251de73f56a6b0ae95bbeb592e0eb0775 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 23 May 2011 14:44:19 -0700 Subject: [PATCH] --- yaml --- r: 254169 b: refs/heads/master c: bb2b43fefab723f4a0760146e7bed59d41a50e53 h: refs/heads/master i: 254167: 486896b6a74d4137c68db5efdc08bc75831c953c v: v3 --- [refs] | 2 +- trunk/drivers/base/platform.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 07c272b52bcf..b4427da51642 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7316a9f2a94c14e66e9421a777dffc509a2fe0e3 +refs/heads/master: bb2b43fefab723f4a0760146e7bed59d41a50e53 diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c index 1c291af637b3..6040717b62bb 100644 --- a/trunk/drivers/base/platform.c +++ b/trunk/drivers/base/platform.c @@ -367,7 +367,7 @@ EXPORT_SYMBOL_GPL(platform_device_unregister); * * Returns &struct platform_device pointer on success, or ERR_PTR() on error. */ -struct platform_device *__init_or_module platform_device_register_resndata( +struct platform_device *platform_device_register_resndata( struct device *parent, const char *name, int id, const struct resource *res, unsigned int num,