From 15ff3d5806814e7ad811886e0070aa8fae4e22fd Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Fri, 11 Jan 2008 17:24:53 +1100 Subject: [PATCH] --- yaml --- r: 75872 b: refs/heads/master c: ae72cddb2338bc36b991674a56a7bf70ae104d9e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/platform.c | 2 +- trunk/include/linux/platform_device.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d64c13a60e0a..cc0405c51c40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92b421416f8194aec87b1439487b5544e9ac8187 +refs/heads/master: ae72cddb2338bc36b991674a56a7bf70ae104d9e diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c index bdd59e8358f0..48d5db4f92ee 100644 --- a/trunk/drivers/base/platform.c +++ b/trunk/drivers/base/platform.c @@ -360,7 +360,7 @@ EXPORT_SYMBOL_GPL(platform_device_unregister); * the Linux driver model. In particular, when such drivers are built * as modules, they can't be "hotplugged". */ -struct platform_device *platform_device_register_simple(char *name, int id, +struct platform_device *platform_device_register_simple(const char *name, int id, struct resource *res, unsigned int num) { struct platform_device *pdev; diff --git a/trunk/include/linux/platform_device.h b/trunk/include/linux/platform_device.h index e80804316cdb..3261681c82a4 100644 --- a/trunk/include/linux/platform_device.h +++ b/trunk/include/linux/platform_device.h @@ -35,7 +35,7 @@ extern struct resource *platform_get_resource_byname(struct platform_device *, u extern int platform_get_irq_byname(struct platform_device *, char *); extern int platform_add_devices(struct platform_device **, int); -extern struct platform_device *platform_device_register_simple(char *, int id, +extern struct platform_device *platform_device_register_simple(const char *, int id, struct resource *, unsigned int); extern struct platform_device *platform_device_alloc(const char *name, int id);