diff options
| author | Andreas Larsson <andreas@gaisler.com> | 2012-11-23 12:24:09 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-11-23 22:01:15 +0000 |
| commit | 0e622d39197f0b64b9e043fe75ac3634bf9f3a05 (patch) | |
| tree | 0aa37b6321b32ee93b9cf53c99602c1eee411513 /arch | |
| parent | 26d29d06ea020411559f75ec908db235ca1838d9 (diff) | |
| download | linux-0e622d39197f0b64b9e043fe75ac3634bf9f3a05.tar.bz2 | |
of/address: sparc: Declare of_iomap as an extern function for sparc again
This bug-fix makes sure that of_iomap is defined extern for sparc so that the
sparc-specific implementation of_iomap is once again used when including
include/linux/of_address.h in a sparc context. OF_GPIO that is now available for
sparc relies on this.
The bug was inadvertently introduced in a850a75, "of/address: add empty static
inlines for !CONFIG_OF", that added a static dummy inline for of_iomap when
!CONFIG_OF_ADDRESS. However, CONFIG_OF_ADDRESS is never defined for sparc, but
there is a sparc-specific implementation /arch/sparc/kernel/of_device_common.c.
This fix takes the same approach as 0bce04b that solved the equivalent problem
for of_address_to_resource.
Signed-off-by: Andreas Larsson <andreas@gaisler.com>
Acked-by: David Miller <davem@davemloft.net>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/include/asm/prom.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h index f93003123bce..67c62578d170 100644 --- a/arch/sparc/include/asm/prom.h +++ b/arch/sparc/include/asm/prom.h @@ -63,10 +63,13 @@ extern char *of_console_options; extern void irq_trans_init(struct device_node *dp); extern char *build_path_component(struct device_node *dp); -/* SPARC has a local implementation */ +/* SPARC has local implementations */ extern int of_address_to_resource(struct device_node *dev, int index, struct resource *r); #define of_address_to_resource of_address_to_resource +void __iomem *of_iomap(struct device_node *node, int index); +#define of_iomap of_iomap + #endif /* __KERNEL__ */ #endif /* _SPARC_PROM_H */ |