diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-03-01 13:24:22 +0100 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-03-01 13:26:51 +0100 |
| commit | 89d4a1753b6632327f18d6c8e0842b366b736621 (patch) | |
| tree | eb74be7a995d5b5b3f29f5c6794736a514109d80 /drivers/of | |
| parent | 7eca30aef7961e68ad74c0ef920546c2be7f6579 (diff) | |
| parent | 280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff) | |
| download | op-kernel-dev-89d4a1753b6632327f18d6c8e0842b366b736621.zip op-kernel-dev-89d4a1753b6632327f18d6c8e0842b366b736621.tar.gz | |
Merge branch 'irqdomain/next' of git://git.secretlab.ca/git/linux-2.6
Diffstat (limited to 'drivers/of')
| -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 cae9477..343ad29 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 */ |
