diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-24 02:36:06 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-24 02:36:06 +0400 |
| commit | 5e351cdc998db82935d1248a053a1be37d1160fd (patch) | |
| tree | 6d1e1447abb053056400a13aa4a7932a6d5a89e1 /arch | |
| parent | a0543d64388146f83ff7aef4abb42f8fd074d5e0 (diff) | |
| parent | 0e622d39197f0b64b9e043fe75ac3634bf9f3a05 (diff) | |
| download | linux-5e351cdc998db82935d1248a053a1be37d1160fd.tar.xz | |
Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull device tree regression fix from Grant Likely:
"Simple build regression fix for DT device drivers on Sparc. An
earlier change had masked out the of_iomap() helper on SPARC."
* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
of/address: sparc: Declare of_iomap as an extern function for sparc again
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 */ |