diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-23 23:36:06 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-23 23:36:06 +0100 |
| commit | 5e351cdc998db82935d1248a053a1be37d1160fd (patch) | |
| tree | 6d1e1447abb053056400a13aa4a7932a6d5a89e1 /include | |
| parent | Merge tag 'pm-for-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff) | |
| parent | of/address: sparc: Declare of_iomap as an extern function for sparc again (diff) | |
| download | linux-5e351cdc998db82935d1248a053a1be37d1160fd.tar.xz linux-5e351cdc998db82935d1248a053a1be37d1160fd.zip | |
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 'include')
| -rw-r--r-- | include/linux/of_address.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/of_address.h b/include/linux/of_address.h index e20e3af68fb6..0506eb53519b 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h @@ -42,10 +42,12 @@ static inline struct device_node *of_find_matching_node_by_address( { return NULL; } +#ifndef of_iomap static inline void __iomem *of_iomap(struct device_node *device, int index) { return NULL; } +#endif static inline const __be32 *of_get_address(struct device_node *dev, int index, u64 *size, unsigned int *flags) { |