diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-03-01 07:24:22 -0500 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-03-01 07:26:51 -0500 |
| commit | 89d4a1753b6632327f18d6c8e0842b366b736621 (patch) | |
| tree | eb74be7a995d5b5b3f29f5c6794736a514109d80 /drivers/of | |
| parent | 7eca30aef7961e68ad74c0ef920546c2be7f6579 (diff) | |
| parent | 280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff) | |
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 cae9477a6ed3..343ad29e211c 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c | |||
| @@ -55,7 +55,7 @@ EXPORT_SYMBOL(of_find_device_by_node); | |||
| 55 | #include <asm/dcr.h> | 55 | #include <asm/dcr.h> |
| 56 | #endif | 56 | #endif |
| 57 | 57 | ||
| 58 | #if !defined(CONFIG_SPARC) | 58 | #ifdef CONFIG_OF_ADDRESS |
| 59 | /* | 59 | /* |
| 60 | * The following routines scan a subtree and registers a device for | 60 | * The following routines scan a subtree and registers a device for |
| 61 | * each applicable node. | 61 | * each applicable node. |
| @@ -462,4 +462,4 @@ int of_platform_populate(struct device_node *root, | |||
| 462 | of_node_put(root); | 462 | of_node_put(root); |
| 463 | return rc; | 463 | return rc; |
| 464 | } | 464 | } |
| 465 | #endif /* !CONFIG_SPARC */ | 465 | #endif /* CONFIG_OF_ADDRESS */ |