projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'spi/fix/lock', 'spi/fix/maintainers', 'spi/fix/put...
[cascardo/linux.git]
/
drivers
/
of
/
platform.c
diff --git
a/drivers/of/platform.c
b/drivers/of/platform.c
index
8aa1976
..
f39ccd5
100644
(file)
--- a/
drivers/of/platform.c
+++ b/
drivers/of/platform.c
@@
-497,6
+497,7
@@
int of_platform_default_populate(struct device_node *root,
}
EXPORT_SYMBOL_GPL(of_platform_default_populate);
}
EXPORT_SYMBOL_GPL(of_platform_default_populate);
+#ifndef CONFIG_PPC
static int __init of_platform_default_populate_init(void)
{
struct device_node *node;
static int __init of_platform_default_populate_init(void)
{
struct device_node *node;
@@
-521,6
+522,7
@@
static int __init of_platform_default_populate_init(void)
return 0;
}
arch_initcall_sync(of_platform_default_populate_init);
return 0;
}
arch_initcall_sync(of_platform_default_populate_init);
+#endif
static int of_platform_device_destroy(struct device *dev, void *data)
{
static int of_platform_device_destroy(struct device *dev, void *data)
{