git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
[pandora-kernel.git]
/
drivers
/
base
/
platform.c
diff --git
a/drivers/base/platform.c
b/drivers/base/platform.c
index
d10230a
..
765bcf0
100644
(file)
--- a/
drivers/base/platform.c
+++ b/
drivers/base/platform.c
@@
-187,7
+187,7
@@
EXPORT_SYMBOL_GPL(platform_device_alloc);
* released.
*/
int platform_device_add_resources(struct platform_device *pdev,
* released.
*/
int platform_device_add_resources(struct platform_device *pdev,
- struct resource *res, unsigned int num)
+
const
struct resource *res, unsigned int num)
{
struct resource *r;
{
struct resource *r;
@@
-367,7
+367,7
@@
EXPORT_SYMBOL_GPL(platform_device_unregister);
*/
struct platform_device *platform_device_register_simple(const char *name,
int id,
*/
struct platform_device *platform_device_register_simple(const char *name,
int id,
- struct resource *res,
+
const
struct resource *res,
unsigned int num)
{
struct platform_device *pdev;
unsigned int num)
{
struct platform_device *pdev;
@@
-1259,7
+1259,7
@@
static int __init early_platform_driver_probe_id(char *class_str,
* dev_name() and others to be used before the
* rest of the driver core is initialized.
*/
* dev_name() and others to be used before the
* rest of the driver core is initialized.
*/
- if (!match->dev.init_name) {
+ if (!match->dev.init_name
&& slab_is_available()
) {
if (match->id != -1)
match->dev.init_name =
kasprintf(GFP_KERNEL, "%s.%d",
if (match->id != -1)
match->dev.init_name =
kasprintf(GFP_KERNEL, "%s.%d",