diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-29 13:32:39 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-29 13:32:39 -0800 |
| commit | 428f5ad80118a60a519dcea5ca24d27bae757ff9 (patch) | |
| tree | b99adf5a2671db3b5821e63e439ff14b74b0b31c /drivers/of/platform.c | |
| parent | ffd76d8be36da09f8456c55569c008f5aa93095e (diff) | |
| parent | fbf75da733e82bb17a01e1b907b0e40d9c028823 (diff) | |
Merge branch 'for_3.4/dt_irq_domain' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into dt-part2
Diffstat (limited to 'drivers/of/platform.c')
| -rw-r--r-- | drivers/of/platform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 63b3ec48c20..20fbebd49db 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -55,7 +55,7 @@ EXPORT_SYMBOL(of_find_device_by_node); #include <asm/dcr.h> #endif -#if !defined(CONFIG_SPARC) +#ifdef CONFIG_OF_ADDRESS /* * The following routines scan a subtree and registers a device for * each applicable node. @@ -462,4 +462,4 @@ int of_platform_populate(struct device_node *root, of_node_put(root); return rc; } -#endif /* !CONFIG_SPARC */ +#endif /* CONFIG_OF_ADDRESS */ |