diff options
| author | Benoit Cousson <b-cousson@ti.com> | 2012-02-27 10:32:39 +0100 |
|---|---|---|
| committer | Benoit Cousson <b-cousson@ti.com> | 2012-02-27 10:32:39 +0100 |
| commit | 1f52299ec000e2161635b263d81ab92ea7f1f0a7 (patch) | |
| tree | 66b1414ce81dacf5758e824640f869d16d024c4a /drivers/of/platform.c | |
| parent | ffd76d8be36da09f8456c55569c008f5aa93095e (diff) | |
| parent | 280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff) | |
| download | linux-1f52299ec000e2161635b263d81ab92ea7f1f0a7.tar.bz2 | |
Merge branch 'irqdomain/next' of git://git.secretlab.ca/git/linux-2.6 into for_3.4/dt_irq_domain2
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 63b3ec48c203..20fbebd49db3 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 */ |