tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+6
-1
+4
-1
arch/sparc/include/asm/prom.h
+4
-1
arch/sparc/include/asm/prom.h
···
63
63
extern void irq_trans_init(struct device_node *dp);
64
64
extern char *build_path_component(struct device_node *dp);
65
65
66
-
/* SPARC has a local implementation */
66
+
/* SPARC has local implementations */
67
67
extern int of_address_to_resource(struct device_node *dev, int index,
68
68
struct resource *r);
69
69
#define of_address_to_resource of_address_to_resource
70
+
71
+
void __iomem *of_iomap(struct device_node *node, int index);
72
+
#define of_iomap of_iomap
70
73
71
74
#endif /* __KERNEL__ */
72
75
#endif /* _SPARC_PROM_H */
+2
include/linux/of_address.h
+2
include/linux/of_address.h
···
42
42
{
43
43
return NULL;
44
44
}
45
+
#ifndef of_iomap
45
46
static inline void __iomem *of_iomap(struct device_node *device, int index)
46
47
{
47
48
return NULL;
48
49
}
50
+
#endif
49
51
static inline const __be32 *of_get_address(struct device_node *dev, int index,
50
52
u64 *size, unsigned int *flags)
51
53
{